refactor feature steps

features/steps/project_network_graph.rb → features/steps/project/project_network_graph.rb

 class ProjectNetworkGraph < Spinach::FeatureSteps
+  include SharedAuthentication
+  include SharedProject
+
   Then 'page should have network graph' do
     page.should have_content "Project Network Graph"
     within ".graph" do
@@ -7,15 +10,6 @@ class ProjectNetworkGraph < Spinach::FeatureSteps
     end
   end
-  Given 'I sign in as a user' do
-    login_as :user
-  end
-
-  And 'I own project "Shop"' do
-    @project = Factory :project, :name => "Shop"
-    @project.add_access(@user, :admin)
-  end
-
   And 'I visit project "Shop" network page' do
     project = Project.find_by_name("Shop")

features/steps/project_team_management.rb → features/steps/project/project_team_management.rb

 class ProjectTeamManagement < Spinach::FeatureSteps
+  include SharedAuthentication
+  include SharedProject
+  include SharedPaths
+
   Then 'I should be able to see myself in team' do
     page.should have_content(@user.name)
     page.should have_content(@user.email)
@@ -42,10 +46,6 @@ class ProjectTeamManagement < Spinach::FeatureSteps
     end
   end
-  Then 'I visit project "Shop" team page' do
-    visit team_project_path(Project.find_by_name("Shop"))
-  end
-
   And 'I should see "Sam" in team list as "Reporter"' do
     user = User.find_by_name("Sam")
     role_id = find(".user_#{user.id} #team_member_project_access").value
@@ -73,15 +73,6 @@ class ProjectTeamManagement < Spinach::FeatureSteps
     page.should_not have_content(user.email)
   end
-  Given 'I sign in as a user' do
-    login_as :user
-  end
-
-  And 'I own project "Shop"' do
-    @project = Factory :project, :name => "Shop"
-    @project.add_access(@user, :admin)
-  end
-
   And 'gitlab user "Mike"' do
     Factory :user, :name => "Mike"
   end

features/steps/project/project_wall.rb

+class ProjectWall < Spinach::FeatureSteps
+  include SharedAuthentication
+  include SharedProject
+  include SharedNote
+  include SharedPaths
+end

features/steps/project_wiki.rb → features/steps/project/project_wiki.rb

 class ProjectWiki < Spinach::FeatureSteps
+  include SharedAuthentication
+  include SharedProject
+  include SharedNote
+  include SharedPaths
+
   Given 'I create Wiki page' do
     fill_in "Title", :with => 'Test title'
     fill_in "Content", :with => '[link test](test)'
@@ -12,26 +17,4 @@ class ProjectWiki < Spinach::FeatureSteps
     click_link "link test"
     page.should have_content "Editing page"
   end
-
-  And 'I leave a comment like "XML attached"' do
-    fill_in "note_note", :with => "XML attached"
-    click_button "Add Comment"
-  end
-
-  Then 'I should see comment "XML attached"' do
-    page.should have_content "XML attached"
-  end
-
-  Given 'I sign in as a user' do
-    login_as :user
-  end
-
-  And 'I own project "Shop"' do
-    @project = Factory :project, :name => "Shop"
-    @project.add_access(@user, :admin)
-  end
-
-  Given 'I visit project wiki page' do
-    visit project_wiki_path(@project, :index)
-  end
 end

features/steps/project_comment_commit.rb

-class ProjectCommentCommit < Spinach::FeatureSteps
-  Given 'I leave a comment like "XML attached"' do
-    fill_in "note_note", :with => "XML attached"
-    click_button "Add Comment"
-  end
-
-  Then 'I should see comment "XML attached"' do
-    page.should have_content "XML attached"
-  end
-
-  Given 'I sign in as a user' do
-    login_as :user
-  end
-
-  And 'I own project "Shop"' do
-    @project = Factory :project, :name => "Shop"
-    @project.add_access(@user, :admin)
-  end
-
-  Given 'I visit project commit page' do
-    visit project_commit_path(@project, ValidCommit::ID)
-  end
-end

features/steps/shared/authentication.rb

+require Rails.root.join('spec', 'support', 'login_helpers')
+
+module SharedAuthentication
+  include Spinach::DSL
+  include LoginHelpers
+
+  Given 'I sign in as a user' do
+    login_as :user
+  end
+end

features/steps/project_wall.rb → features/steps/shared/note.rb

-class ProjectWall < Spinach::FeatureSteps
-  Given 'I write new comment "my special test message"' do
-    fill_in "note_note", :with => "my special test message"
-    click_button "Add Comment"
-  end
-  Then 'I should see project wall note "my special test message"' do
-    page.should have_content "my special test message"
+module SharedNote
+  include Spinach::DSL
+  Given 'I leave a comment like "XML attached"' do
+    fill_in "note_note", :with => "XML attached"
+    click_button "Add Comment"
   end
-  Then 'I visit project "Shop" wall page' do
-    project = Project.find_by_name("Shop")
-    visit wall_project_path(project)
+  Then 'I should see comment "XML attached"' do
+    page.should have_content "XML attached"
   end
-  Given 'I signin as a user' do
-    login_as :user
+  Given 'I write new comment "my special test message"' do
+    fill_in "note_note", :with => "my special test message"
+    click_button "Add Comment"
   end
-  And 'I own project "Shop"' do
-    @project = Factory :project, :name => "Shop"
-    @project.add_access(@user, :admin)
+  Then 'I should see project wall note "my special test message"' do
+    page.should have_content "my special test message"
   end
 end

features/steps/shared/paths.rb

+module SharedPaths
+  include Spinach::DSL
+
+  And 'I visit dashboard search page' do
+    visit search_path
+  end
+
+  And 'I visit dashboard merge requests page' do
+    visit dashboard_merge_requests_path
+  end
+
+  And 'I visit dashboard issues page' do
+    visit dashboard_issues_path
+  end
+
+  When 'I visit dashboard page' do
+    visit dashboard_path
+  end
+
+  Given 'I visit profile page' do
+    visit profile_path
+  end
+
+  Given 'I visit profile password page' do
+    visit profile_password_path
+  end
+
+  Given 'I visit profile token page' do
+    visit profile_token_path
+  end
+
+  When 'I visit new project page' do
+    visit new_project_path
+  end
+
+  And 'I visit project "Shop" page' do
+    project = Project.find_by_name("Shop")
+    visit project_path(project)
+  end
+
+  Given 'I visit project branches page' do
+    visit branches_project_repository_path(@project)
+  end
+
+  Given 'I visit compare refs page' do
+    visit compare_project_commits_path(@project)
+  end
+
+  Given 'I visit project commits page' do
+    visit project_commits_path(@project)
+  end
+
+  Given 'I visit project source page' do
+    visit tree_project_ref_path(@project, @project.root_ref)
+  end
+
+  Given 'I visit blob file from repo' do
+    visit tree_project_ref_path(@project, ValidCommit::ID, :path => ValidCommit::BLOB_FILE_PATH)
+  end
+
+  Given 'I visit project source page for "8470d70"' do
+    visit tree_project_ref_path(@project, "8470d70")
+  end
+
+  Given 'I visit project tags page' do
+    visit tags_project_repository_path(@project)
+  end
+
+  Given 'I visit project commit page' do
+    visit project_commit_path(@project, ValidCommit::ID)
+  end
+
+  And 'I visit project "Shop" issues page' do
+    visit project_issues_path(Project.find_by_name("Shop"))
+  end
+
+  Given 'I visit issue page "Release 0.4"' do
+    issue = Issue.find_by_title("Release 0.4")
+    visit project_issue_path(issue.project, issue)
+  end
+
+  Given 'I visit project "Shop" labels page' do
+    visit project_labels_path(Project.find_by_name("Shop"))
+  end
+
+  Given 'I visit merge request page "Bug NS-04"' do
+    mr = MergeRequest.find_by_title("Bug NS-04")
+    visit project_merge_request_path(mr.project, mr)
+  end
+
+  And 'I visit project "Shop" merge requests page' do
+    visit project_merge_requests_path(Project.find_by_name("Shop"))
+  end
+
+  Given 'I visit project "Shop" milestones page' do
+    @project = Project.find_by_name("Shop")
+    visit project_milestones_path(@project)
+  end
+
+  Then 'I visit project "Shop" team page' do
+    visit team_project_path(Project.find_by_name("Shop"))
+  end
+
+  Then 'I visit project "Shop" wall page' do
+    project = Project.find_by_name("Shop")
+    visit wall_project_path(project)
+  end
+
+  Given 'I visit project wiki page' do
+    visit project_wiki_path(@project, :index)
+  end
+end

features/steps/project.rb → features/steps/shared/project.rb

-class Projects < Spinach::FeatureSteps
-  Given 'I sign in as a user' do
-    login_as :user
-  end
+module SharedProject
+  include Spinach::DSL
   And 'I own project "Shop"' do
     @project = Factory :project, :name => "Shop"
     @project.add_access(@user, :admin)
   end
-
-  And 'I visit project "Shop" page' do
-    project = Project.find_by_name("Shop")
-    visit project_path(project)
-  end
 end

features/support/env.rb

@@ -5,11 +5,12 @@ require 'rspec'
 require 'database_cleaner'
 require 'spinach/capybara'
-%w(gitolite_stub login_helpers stubbed_repository valid_commit).each do |f|
+%w(gitolite_stub stubbed_repository valid_commit).each do |f|
   require Rails.root.join('spec', 'support', f)
 end
-include LoginHelpers
+Dir["#{Rails.root}/features/steps/shared/*.rb"].each {|file| require file}
+
 include GitoliteStub
 WebMock.allow_net_connect!