[PATCH conductor 2/6] Rspec realm model fixes

From: Jan Provaznik <jprovazn(a)redhat.com&gt; --- src/features/step_definitions/instance_steps.rb | 2 +- src/spec/factories/frontend_realm.rb | 3 ++ src/spec/factories/realm.rb | 3 -- src/spec/factories/realm_backend_target.rb | 4 ++ src/spec/models/realm_spec.rb | 41 +++++----------------- 5 files changed, 18 insertions(+), 35 deletions(-) create mode 100644 src/spec/factories/frontend_realm.rb create mode 100644 src/spec/factories/realm_backend_target.rb diff --git a/src/features/step_definitions/instance_steps.rb b/src/features/step_definitions/instance_steps.rb index 4324891..b843af2 100644 --- a/src/features/step_definitions/instance_steps.rb +++ b/src/features/step_definitions/instance_steps.rb @@ -56,7 +56,7 @@ Given /^there is "([^"]*)" aggregator hardware profile$/ do |name| end Given /^there is "([^"]*)" aggregator realm$/ do |name| - Factory :frontend_realm, :provider_id => nil, :name => name + Factory :frontend_realm, :backend_realm => Factory(:provider), :name => name end Given /^there is "([^"]*)" pool$/ do |arg1| diff --git a/src/spec/factories/frontend_realm.rb b/src/spec/factories/frontend_realm.rb new file mode 100644 index 0000000..215869a --- /dev/null +++ b/src/spec/factories/frontend_realm.rb @@ -0,0 +1,3 @@ +Factory.define :frontend_realm do |r| + r.sequence(:name) { |n| "realm#{n}" } +end diff --git a/src/spec/factories/realm.rb b/src/spec/factories/realm.rb index a13f09d..92a677c 100644 --- a/src/spec/factories/realm.rb +++ b/src/spec/factories/realm.rb @@ -20,6 +20,3 @@ Factory.define :backend_realm, :parent => :realm do |r| r.name 'backend_name' r.external_key 'backend_key' end - -Factory.define :frontend_realm, :parent => :backend_realm do |r| -end diff --git a/src/spec/factories/realm_backend_target.rb b/src/spec/factories/realm_backend_target.rb new file mode 100644 index 0000000..f018cd4 --- /dev/null +++ b/src/spec/factories/realm_backend_target.rb @@ -0,0 +1,4 @@ +Factory.define :realm_backend_target do |r| + r.association(:frontend_realm) + r.association :realm_or_provider, :fatcory => :backend_realm +end diff --git a/src/spec/models/realm_spec.rb b/src/spec/models/realm_spec.rb index 6f8ce19..6d16355 100644 --- a/src/spec/models/realm_spec.rb +++ b/src/spec/models/realm_spec.rb @@ -6,45 +6,24 @@ describe Realm do @provider = Factory :mock_provider @backend_realm = Factory :backend_realm, :provider => @provider - @frontend_realm = Factory :frontend_realm, :provider => nil - @backend_realm.frontend_realms << @frontend_realm - @frontend_realm.backend_realms << @backend_realm + @frontend_realm1 = Factory :frontend_realm + RealmBackendTarget.create!(:frontend_realm => @frontend_realm1, :realm_or_provider => @backend_realm) + RealmBackendTarget.create!(:frontend_realm => @frontend_realm1, :realm_or_provider => @provider) end it "should validate backend" do @backend_realm.provider_id.should_not be_nil - @backend_realm.backend_realms.should be_empty - @backend_realm.frontend_realms.should_not be_empty - @backend_realm.frontend_realms.first.id.should == @frontend_realm.id + @backend_realm.frontend_realms.first.id.should == @frontend_realm1.id + @provider.frontend_realms.should_not be_empty + @provider.frontend_realms.first.id.should == @frontend_realm1.id end it "should validate frontend" do - @frontend_realm.provider_id.should be_nil - @frontend_realm.frontend_realms.should be_empty - - @frontend_realm.backend_realms.should_not be_empty - @frontend_realm.backend_realms.first.id.should == @backend_realm.id - end - - it "should map the frontend and backend names" do - @frontend_realm.name = 'different_from' + @backend_realm.name - @frontend_realm.should_not be_valid - @backend_realm.should_not be_valid - - @frontend_realm.name = @backend_realm.name - @frontend_realm.should be_valid - @backend_realm.should be_valid - end - - it "should map the frontend and backend keys" do - @frontend_realm.external_key = 'different_from' + @backend_realm.external_key - @frontend_realm.should_not be_valid - @backend_realm.should_not be_valid - - @frontend_realm.external_key = @backend_realm.external_key - @frontend_realm.should be_valid - @backend_realm.should be_valid + @frontend_realm1.backend_realms.should_not be_empty + @frontend_realm1.backend_realms.first.id.should == @backend_realm.id + @frontend_realm1.backend_providers.should_not be_nil + @frontend_realm1.backend_providers.first.id.should == @provider.id end end -- 1.7.3.5