Tidy up cucumbers a tad.

features/engine/has_many.feature

@@ -3,9 +3,6 @@ Feature: Has Many Association
   In order to make dealing with models easier
   I want to be able to display other models that have a has many association
 
-  Background:
-    Given I have the site: "test site" set up
-
   Scenario: Paginating a has many association
-    Given I have an "Articles" model which has many "Comments"
-    Then I should be able to view a paginated list of "Comments" per "Articles"
+    Given I have a site set up
+    Then I should be able to view a paginaed list of a has many association

features/engine/pagination.feature

@@ -4,5 +4,5 @@ Feature: Pagination
   I want to be able to paginate through models
 
   Scenario: Paginating through a model
-    Given I have a site setup
+    Given I have a site set up
     Then I should be able to display paginated models

features/step_definitions/has_many_steps.rb

@@ -17,7 +17,10 @@ Given %r{^I have an? "([^"]*)" model which has many "([^"]*)"$} do |parent_model
   })
 end
 
-Then /^I should be able to view a paginated list of "([^"]*)" per "([^"]*)"$/ do |parent_model, child_model|
+Then /^I should be able to view a paginaed list of a has many association$/ do
+  # Create models
+  Given %{I have an "Articles" model which has many "Comments"}
+
   # Create contents
   article = @parent_model.contents.create!(:slug => 'parent', :body => 'Parent')
   @child_model.contents.create!(:slug => 'one', :body => 'One', :custom_field_2 => article.id.to_s)

features/step_definitions/site_steps.rb

@@ -13,7 +13,7 @@ Given /^I have the site: "([^"]*)" set up(?: with #{capture_fields})?$/ do |site
   @admin.should_not be_nil
 end
 
-Given /^I have a site setup$/ do
+Given /^I have a site set up$/ do
   Given %{I have the site: "test site" set up}
 end