Commit 753ecbdcecfacfaea9157267db4151d1b68e555a

Authored by Dmitriy Zaporozhets
1 parent 38ecec44

Change spinach tab tests to fit new tabs navigation

features/project/active_tab.feature
@@ -49,51 +49,52 @@ Feature: Project active tab @@ -49,51 +49,52 @@ Feature: Project active tab
49 49
50 Scenario: On Project Home/Show 50 Scenario: On Project Home/Show
51 Given I visit my project's home page 51 Given I visit my project's home page
52 - Then the active sub tab should be Show  
53 - And no other sub tabs should be active  
54 - And the active main tab should be Home 52 + Then the active main tab should be Home
  53 + And no other main tabs should be active
55 54
56 - Scenario: On Project Home/Team  
57 - Given I visit my project's home page  
58 - And I click the "Team" tab  
59 - Then the active sub tab should be Team  
60 - And no other sub tabs should be active  
61 - And the active main tab should be Home 55 + #Scenario: On Project Settings/Attachments
  56 + #Given I visit my project's home page
  57 + #And I click the "Attachments" tab
  58 + #Then the active sub tab should be Attachments
  59 + #And no other sub tabs should be active
  60 + #And the active main tab should be Home
62 61
63 - Scenario: On Project Home/Attachments  
64 - Given I visit my project's home page  
65 - And I click the "Attachments" tab  
66 - Then the active sub tab should be Attachments  
67 - And no other sub tabs should be active  
68 - And the active main tab should be Home 62 + #Scenario: On Project Settings/Snippets
  63 + #Given I visit my project's home page
  64 + #And I click the "Snippets" tab
  65 + #Then the active sub tab should be Snippets
  66 + #And no other sub tabs should be active
  67 + #And the active main tab should be Home
69 68
70 - Scenario: On Project Home/Snippets  
71 - Given I visit my project's home page  
72 - And I click the "Snippets" tab  
73 - Then the active sub tab should be Snippets 69 + # Sub Tabs: Settings
  70 +
  71 + Scenario: On Project Settings/Team
  72 + Given I visit my project's settings page
  73 + And I click the "Team" tab
  74 + Then the active sub tab should be Team
74 And no other sub tabs should be active 75 And no other sub tabs should be active
75 - And the active main tab should be Home 76 + And the active main tab should be Settings
76 77
77 - Scenario: On Project Home/Edit  
78 - Given I visit my project's home page 78 + Scenario: On Project Settings/Edit
  79 + Given I visit my project's settings page
79 And I click the "Edit" tab 80 And I click the "Edit" tab
80 Then the active sub tab should be Edit 81 Then the active sub tab should be Edit
81 And no other sub tabs should be active 82 And no other sub tabs should be active
82 - And the active main tab should be Home 83 + And the active main tab should be Settings
83 84
84 - Scenario: On Project Home/Hooks  
85 - Given I visit my project's home page 85 + Scenario: On Project Settings/Hooks
  86 + Given I visit my project's settings page
86 And I click the "Hooks" tab 87 And I click the "Hooks" tab
87 Then the active sub tab should be Hooks 88 Then the active sub tab should be Hooks
88 And no other sub tabs should be active 89 And no other sub tabs should be active
89 - And the active main tab should be Home 90 + And the active main tab should be Settings
90 91
91 - Scenario: On Project Home/Deploy Keys  
92 - Given I visit my project's home page 92 + Scenario: On Project Settings/Deploy Keys
  93 + Given I visit my project's settings page
93 And I click the "Deploy Keys" tab 94 And I click the "Deploy Keys" tab
94 Then the active sub tab should be Deploy Keys 95 Then the active sub tab should be Deploy Keys
95 And no other sub tabs should be active 96 And no other sub tabs should be active
96 - And the active main tab should be Home 97 + And the active main tab should be Settings
97 98
98 # Sub Tabs: Commits 99 # Sub Tabs: Commits
99 100
features/steps/project/project_active_tab.rb
@@ -10,6 +10,10 @@ class ProjectActiveTab < Spinach::FeatureSteps @@ -10,6 +10,10 @@ class ProjectActiveTab < Spinach::FeatureSteps
10 ensure_active_main_tab('Home') 10 ensure_active_main_tab('Home')
11 end 11 end
12 12
  13 + Then 'the active main tab should be Settings' do
  14 + ensure_active_main_tab('Settings')
  15 + end
  16 +
13 Then 'the active main tab should be Files' do 17 Then 'the active main tab should be Files' do
14 ensure_active_main_tab('Files') 18 ensure_active_main_tab('Files')
15 end 19 end
features/steps/shared/paths.rb
@@ -125,6 +125,10 @@ module SharedPaths @@ -125,6 +125,10 @@ module SharedPaths
125 visit project_path(@project) 125 visit project_path(@project)
126 end 126 end
127 127
  128 + Given "I visit my project's settings page" do
  129 + visit edit_project_path(@project)
  130 + end
  131 +
128 Given "I visit my project's files page" do 132 Given "I visit my project's files page" do
129 visit project_tree_path(@project, root_ref) 133 visit project_tree_path(@project, root_ref)
130 end 134 end