---
src/features/pool.feature | 2 +-
src/features/step_definitions/deployment_steps.rb | 13 ++++++++++---
src/features/step_definitions/pool_steps.rb | 4 +++-
src/features/support/env.rb | 2 +-
4 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/features/pool.feature b/src/features/pool.feature
index 9422a17..de4eedc 100644
--- a/src/features/pool.feature
+++ b/src/features/pool.feature
@@ -177,7 +177,7 @@ Feature: Manage Pools
Given a pool "mockpool" exists with deployment "mockdeployment"
When I am viewing the pool "mockpool"
And I follow link with ID "pretty_view"
- Then I should see "0 Instances" within
".content.collapsible.toggle-view.pools"
+ Then I should not see "0 Instances" within
".content.collapsible.toggle-view.pools"
Scenario: Pools#show filter view
Given a pool "mockpool" exists with deployment "mockdeployment"
diff --git a/src/features/step_definitions/deployment_steps.rb
b/src/features/step_definitions/deployment_steps.rb
index 947c90d..5eedc1d 100644
--- a/src/features/step_definitions/deployment_steps.rb
+++ b/src/features/step_definitions/deployment_steps.rb
@@ -1,7 +1,8 @@
Given /^there is a deployment named "([^"]*)" belonging to
"([^"]*)" owned by "([^"]*)"$/ do |deployment_name,
deployable_name, owner_name|
user = FactoryGirl.create(:user, :login => owner_name, :last_name => owner_name)
- @deployment = Deployment.new({:name => deployment_name, :pool => Pool.first,
:owner => user})
- @deployment.deployable_xml =
DeployableXML.import_xml_from_url("http://localhost/deployables/deployable1.xml")
+ @deployment = Factory.create(:deployment, {:name => deployment_name, :pool =>
Pool.first, :owner => user})
+ instance = Factory.create(:instance, {:deployment => @deployment})
+ @deployment.instances << instance
@deployment.save
end
@@ -23,7 +24,13 @@ Then /^I should see (\d+) deployments in JSON format$/ do |arg1|
end
Given /^a deployment "([^"]*)" exists$/ do |arg1|
- FactoryGirl.create(:deployment, :name => arg1) unless Deployment.find_by_name(arg1)
+ @deployment = Deployment.find_by_name(arg1)
+ if not @deployment
+ @deployment = FactoryGirl.create(:deployment, :name => arg1)
+ instance = Factory.create(:instance, {:deployment => @deployment})
+ @deployment.instances << instance
+ end
+ @deployment
end
Given /^the deployment "([^"]*)" has an instance named
"([^"]*)"$/ do |d_name, i_name|
diff --git a/src/features/step_definitions/pool_steps.rb
b/src/features/step_definitions/pool_steps.rb
index b035f5d..b08af4d 100644
--- a/src/features/step_definitions/pool_steps.rb
+++ b/src/features/step_definitions/pool_steps.rb
@@ -28,7 +28,9 @@ end
Given /^a pool "([^"]*)" exists with deployment "([^"]*)"$/
do |pool_name, deployment_name|
pool = Pool.find_by_name(pool_name) || FactoryGirl.create(:pool, :name =>
pool_name)
- deployment = Deployment.new(:name => deployment_name, :pool => pool, :owner =>
User.first)
+ deployment = Factory.create(:deployment, {:name => deployment_name, :pool =>
pool, :owner => User.first})
+ instance = Factory.create(:instance, :deployment => deployment)
+ deployment.stub(:instances){[instance]}
deployment.deployable_xml =
DeployableXML.import_xml_from_url("http://localhost/deployables/deployable1.xml")
deployment.save!
end
diff --git a/src/features/support/env.rb b/src/features/support/env.rb
index 2d8b48e..b4b2d8d 100644
--- a/src/features/support/env.rb
+++ b/src/features/support/env.rb
@@ -5,7 +5,7 @@
# files.
require 'cucumber/rails'
-
+require 'cucumber/rspec/doubles'
# Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
# order to ease the transition to Capybara we set the default here. If you'd
# prefer to use XPath just remove this line and adjust any selectors in your
--
1.7.6.2