diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-24 15:20:12 +0400 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-24 15:20:12 +0400 |
commit | 5a1429ae2110faaf354574f8e6c7866c29102107 (patch) | |
tree | 8b6b9d8331fd0cb369b4b7937d3e98c33618e4eb | |
parent | 1bb9aeb565fca50304881e36488b202455bdddd2 (diff) |
Fix branches tests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r-- | features/project/commits/branches.feature | 11 | ||||
-rw-r--r-- | features/steps/project/browse_branches.rb | 5 | ||||
-rw-r--r-- | features/steps/shared/paths.rb | 4 |
3 files changed, 8 insertions, 12 deletions
diff --git a/features/project/commits/branches.feature b/features/project/commits/branches.feature index fcf8b7694f4..abebef04fcd 100644 --- a/features/project/commits/branches.feature +++ b/features/project/commits/branches.feature @@ -3,20 +3,17 @@ Feature: Project Browse branches Given I sign in as a user And I own project "Shop" And project "Shop" has protected branches - Given I visit project branches page - - Scenario: I can see project recent git branches - Then I should see "Shop" recent branches list Scenario: I can see project all git branches - Given I click link "All" + Given I visit project branches page Then I should see "Shop" all branches list Scenario: I can see project protected git branches - Given I click link "Protected" + Given I visit project protected branches page Then I should see "Shop" protected branches list Scenario: I create a branch - Given I click new branch link + Given I visit project branches page + And I click new branch link When I submit new branch form Then I should see new branch created diff --git a/features/steps/project/browse_branches.rb b/features/steps/project/browse_branches.rb index 5b5e8ba493e..7a0625952de 100644 --- a/features/steps/project/browse_branches.rb +++ b/features/steps/project/browse_branches.rb @@ -3,11 +3,6 @@ class ProjectBrowseBranches < Spinach::FeatureSteps include SharedProject include SharedPaths - step 'I should see "Shop" recent branches list' do - page.should have_content "Branches" - page.should have_content "master" - end - step 'I click link "All"' do click_link "All" end diff --git a/features/steps/shared/paths.rb b/features/steps/shared/paths.rb index a0213815a78..d36ff7e3884 100644 --- a/features/steps/shared/paths.rb +++ b/features/steps/shared/paths.rb @@ -240,6 +240,10 @@ module SharedPaths visit project_branches_path(@project) end + step 'I visit project protected branches page' do + visit project_protected_branches_path(@project) + end + step 'I visit compare refs page' do visit project_compare_index_path(@project) end |