General cleanup

features/enhanced/ajax_list_pagination.feature

@@ -1,21 +1,21 @@
 Feature: Pagination should be done with AJAX
-    In order to help improve the users experience
-    As a user
-    I want to be able to request a new page and not have the whole page refresh
+  In order to help improve the users experience
+  As a user
+  I want to be able to request a new page and not have the whole page refresh
 
-    Scenario: Requesting a new page should not refresh the whole page
-      Given there is a project
-      And the project has more than 5 features
-      When I am on "projects features"
-      Then the pagination panel should be displayed
-      When I follow "2" within "div.pagination"
-      Then there should be an AJAX request
+  Scenario: Requesting a new page should not refresh the whole page
+    Given there is a project
+    And the project has more than 5 features
+    When I am on "projects features"
+    Then the pagination panel should be displayed
+    When I follow "2" within "div.pagination"
+    Then there should be an AJAX request
 
-    Scenario: When getting a new page I must still be able to hover over a feature and view its stories
-      Given there is a project
-      And the project has more than 5 features
-      When I am on "projects features"
-      Then the pagination panel should be displayed
-      When I follow "2" within "div.pagination"
-      And the first feature is hovered over
-      Then the feature's information will be display in the sidebar
+  Scenario: When getting a new page I must still be able to hover over a feature and view its stories
+    Given there is a project
+    And the project has more than 5 features
+    When I am on "projects features"
+    Then the pagination panel should be displayed
+    When I follow "2" within "div.pagination"
+    And the first feature is hovered over
+    Then the feature's information will be display in the sidebar

features/enhanced/ajaxified_forms.feature

@@ -54,7 +54,6 @@ Feature: All our forms need to be passed to the server via AJAX
     | feature   | story   | edit feature |
     | story     | step    | edit story   |
 
-  # @TODO Move to its own feature file
   Scenario Outline: The ordering button should not be on any of the model index pages
     Given there is a <model>
     Given the "<model>" has 5 "<assoc>"

features/enhanced/form_submission_via_ajax.feature

@@ -13,7 +13,7 @@ Feature: Form submission via AJAX
     And there should be an AJAX request
     And a dialog box should appear
 
-  Examples: A list of form that when submitted should still allow the user to see view source feature file via a dialog box
+  Examples: A list of forms that when submitted should still allow the user to see view source feature file via a dialog box
     | page          | item      | form action |
     | edit feature  | feature   | update      |
 

features/enhanced/hover_dialog.feature

@@ -5,15 +5,15 @@ Feature: When selecting tags we want to be able to select from pre-existing tags
 
     Scenario: When the project tags hover dialog is displayed, it should display all project tags
       Given there is a project
-      Given a project has tags
+      And a project has tags
       When I am on "new project"
       And focus on the tag input
       Then I should see a hover dialog box
       And it should have a list of all project tags
 
     Scenario: A project tag should not be displayed if the tag is present in the tag input
       Given there is a project
-      Given a project has tags
+      And a project has tags
       When I am on "new project"
       And I fill in "project_tag_list" with "Project management"
       And focus on the tag input
@@ -27,7 +27,7 @@ Feature: When selecting tags we want to be able to select from pre-existing tags
 
     Scenario: The hover dialog should not be visible when focus is taken away from the tag input
       Given there is a project
-      Given a project has tags
+      And a project has tags
       When I am on "new project"
       And focus on the tag input
       Then I should see a hover dialog box

features/enhanced/hover_functionality.feature

@@ -30,21 +30,21 @@ Feature: Hovering over a project item
 
   Scenario: When viewing a project we must be able to hover of its items
     Given there is a project
-    Given the "project" has "features"
+    And the "project" has "features"
     When I am on "a project"
     And the first feature is hovered over
     Then the feature's information will be display in the sidebar
 
   Scenario: When viewing a project's feature we must be able to hover of its items
     Given there is a project
-    Given the "project" has "features"
+    And the "project" has "features"
     When I am on the "projects features" page
     And the first feature is hovered over
     Then the feature's information will be display in the sidebar
 
   Scenario: When viewing a feature we must be able to hover of its items
     Given there is a feature
-    Given the "feature" has "stories"
+    And the "feature" has "stories"
     When I am on "a feature"
     And the first story is hovered over
     Then the story's information will be display in the sidebar

features/enhanced/import_feature_ajax_functionality.feature

@@ -4,7 +4,7 @@ Feature: Import feature ajax functionality
   I want the import view to be re-rendered once the import form has been submitted
 
   Scenario: Importing a feature via AJAX should re-render the import view
-    Given there is a project with "location" as "RAILS_ROOT"
+    Given there is a project with a valid location
     When I am on "a project"
     When I click "span.view-panel"
     Then the import link should be visible