Delete cruft from previous iterations

Removing no longer relevant models, controllers, and tests from project As further cleanup for the removing cruft, remove factories, and relations for no longer relevant models
StemboltHQ · Feb 20, 2017 · fec7cf0 · fec7cf0
1 parent fbf3e1c
commit fec7cf0
Show file tree

Hide file tree

Showing 23 changed files with 1 addition and 565 deletions.
diff --git a/app/controllers/staff_controller.rb b/app/controllers/staff_controller.rb
diff --git a/app/models/language.rb b/app/models/language.rb
diff --git a/app/models/person.rb b/app/models/person.rb
@@ -1,6 +1,4 @@
 class Person < ApplicationRecord
-  has_one :staff
-
   has_many :person_presentations
   has_many :presentations, through: :person_presentations
 

diff --git a/app/models/role.rb b/app/models/role.rb
diff --git a/app/models/skill.rb b/app/models/skill.rb
diff --git a/app/models/staff.rb b/app/models/staff.rb
diff --git a/app/views/staff/_errors.html.erb b/app/views/staff/_errors.html.erb
diff --git a/app/views/staff/_form.html.erb b/app/views/staff/_form.html.erb
diff --git a/app/views/staff/edit.html.erb b/app/views/staff/edit.html.erb
diff --git a/app/views/staff/index.html.erb b/app/views/staff/index.html.erb
diff --git a/app/views/staff/new.html.erb b/app/views/staff/new.html.erb
diff --git a/app/views/staff/show.html.erb b/app/views/staff/show.html.erb
diff --git a/config/routes.rb b/config/routes.rb
@@ -1,5 +1,5 @@
 Rails.application.routes.draw do
-  resources :people, :staff
+  resources :people
 
   root 'welcome#index'
 end
diff --git a/spec/factories.rb b/spec/factories.rb
@@ -10,25 +10,11 @@
     password_confirmation "abc123"
     date_of_birth Date.new(1970,01,01)
     gender "Computer"
-
-    trait :invalid do
-      first_name nil
-    end
-  end
-
-  factory :staff do
-    pod 1
-    started_at_company Date.new(2017,01,01)
-    person
   end
 
   factory :presentation do
     title "Test Presentation"
     content "Lorem ipsum dolor"
     date_of_presentation Date.new(2017,02,18)
-
-    trait :invalid do
-      title nil
-    end
   end
 end
diff --git a/spec/models/person_spec.rb b/spec/models/person_spec.rb
@@ -13,14 +13,6 @@
     )
   }
 
-  let!(:staff) {
-    Staff.new(
-      :pod => 1,
-      :started_at_company => Date.new(2017,02,01),
-      :person => subject
-    )
-  }
-
   describe "validations" do
     it "expects valid attributes" do
       expect(subject).to be_valid

diff --git a/spec/models/staff_spec.rb b/spec/models/staff_spec.rb
diff --git a/test/controllers/people_controller_test.rb b/test/controllers/people_controller_test.rb