diff --git a/spec/factories/gremien.rb b/spec/factories/gremien.rb index ba025c0..b85811e 100644 --- a/spec/factories/gremien.rb +++ b/spec/factories/gremien.rb @@ -7,8 +7,5 @@ FactoryGirl.define do name "Kommission" desc "Das ist eine Kommission die sich mit irgendwas beschäftigt" typ 1 - factory :gremium_with_fetprofile do - association :memberships, factory: :membership_with_fetprofile - end - end + end end diff --git a/spec/factories/memberships.rb b/spec/factories/memberships.rb index e73392a..5a715d1 100644 --- a/spec/factories/memberships.rb +++ b/spec/factories/memberships.rb @@ -2,15 +2,11 @@ FactoryGirl.define do factory :membership do - + gremium_id 1 + fetprofile_id 1 start "2013-08-19" stop "2013-08-23" typ 1 - factory :membership_with_fetprofile do - association :fetprofile - end - factory :membership_with_gremium do - association :gremium - end + end end diff --git a/spec/models/gremium_spec.rb b/spec/models/gremium_spec.rb index 08bfae2..effb8f6 100644 --- a/spec/models/gremium_spec.rb +++ b/spec/models/gremium_spec.rb @@ -25,15 +25,16 @@ describe Gremium do expect(Gremium.tabs).to eq([]) end it "destroys memberships if its destroyed" do - g=FactoryGirl.create(:gremium_with_fetprofile) - expect(Membership.count).to be(1) - g.delete - expect(Membership.count).to be(0) + g=FactoryGirl.create(:gremium) + fp=FactoryGirl.create(:fetprofile) + m=FactoryGirl.create(:membership, gremium_id: g.id, fetprofile_id: fp.id) + expect{g.destroy}.to change {Membership.count}.by(-1) + end it "responds to title" do g=FactoryGirl.build(:gremium) - expect(g.responds_to?(:title)).to be true + expect(g.respond_to?(:title)).to be true end end