More refactoring and renamed helper, step modified to reflect change

baphled · Jul 22, 2010 · 84ea41e · 84ea41e
1 parent 8c847f9
commit 84ea41e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/features/step_definitions/general_steps.rb b/features/step_definitions/general_steps.rb
@@ -1,5 +1,5 @@
 Given /^the "([^\"]*)" has ([^\"]*) "([^\"]*)"$/ do |model, amount, assoc|
-  build_associations model, assoc, amount
+  build_associations_by_amount amount, model, assoc
 end
 
 Then /^a flash message '(.*)' should be displayed$/ do |message|

diff --git a/features/step_definitions/pagination_steps.rb b/features/step_definitions/pagination_steps.rb
@@ -1,7 +1,5 @@
 Given /^there are "([^\"]*)"$/ do |model|
-  models = []
-  3.times { models << model.capitalize.singularize.constantize.make }
-  model.capitalize.singularize.constantize.stub!(:all).and_return models
+  build_model_by_amount 3, model
   model.capitalize.singularize.constantize.all.should_not be_empty
 end
 

diff --git a/features/support/env.rb b/features/support/env.rb
@@ -94,7 +94,7 @@ def fill_in_form_with_duplicate_data form_name
 
 module AssociationsHelper
 
-  def build_associations model, assoc, amount
+  def build_associations_by_amount amount, model, assoc
     associated = []
     amount = amount.to_i
     associate = assoc.capitalize.singularize.constantize
@@ -112,7 +112,14 @@ def build_associations model, assoc, amount
           "Now, go and add a mapping in #{__FILE__}"
     end
   end
+
+  def build_model_by_amount amount, model
+    models = []
+    amount.times { models << model.capitalize.singularize.constantize.make }
+    model.capitalize.singularize.constantize.stub!(:all).and_return models
+  end
 end
+
 World(Spec::Mocks::ExampleMethods, FormHelpers, AssociationsHelper)
 
 Before do