Change spinach tab tests to fit new tabs navigation

Dmitriy Zaporozhets
1 parent 38ecec44
Showing 3 changed files with 38 additions and 29 deletions Show diff stats
features/project/active_tab.feature
features/steps/project/project_active_tab.rb
features/steps/shared/paths.rb
@@ -49,51 +49,52 @@ Feature: Project active tab
  
   Scenario: On Project Home/Show
     Given I visit my project's home page
-    Then the active sub tab should be Show
-    And no other sub tabs should be active
-    And the active main tab should be Home
+    Then the active main tab should be Home
+    And no other main tabs should be active
  
-  Scenario: On Project Home/Team
-    Given I visit my project's home page
-    And I click the "Team" tab
-    Then the active sub tab should be Team
-    And no other sub tabs should be active
-    And the active main tab should be Home
+  #Scenario: On Project Settings/Attachments
+    #Given I visit my project's home page
+    #And I click the "Attachments" tab
+    #Then the active sub tab should be Attachments
+    #And no other sub tabs should be active
+    #And the active main tab should be Home
  
-  Scenario: On Project Home/Attachments
-    Given I visit my project's home page
-    And I click the "Attachments" tab
-    Then the active sub tab should be Attachments
-    And no other sub tabs should be active
-    And the active main tab should be Home
+  #Scenario: On Project Settings/Snippets
+    #Given I visit my project's home page
+    #And I click the "Snippets" tab
+    #Then the active sub tab should be Snippets
+    #And no other sub tabs should be active
+    #And the active main tab should be Home
  
-  Scenario: On Project Home/Snippets
-    Given I visit my project's home page
-    And I click the "Snippets" tab
-    Then the active sub tab should be Snippets
+  # Sub Tabs: Settings
+
+  Scenario: On Project Settings/Team
+    Given I visit my project's settings page
+    And I click the "Team" tab
+    Then the active sub tab should be Team
     And no other sub tabs should be active
-    And the active main tab should be Home
+    And the active main tab should be Settings
  
-  Scenario: On Project Home/Edit
-    Given I visit my project's home page
+  Scenario: On Project Settings/Edit
+    Given I visit my project's settings page
     And I click the "Edit" tab
     Then the active sub tab should be Edit
     And no other sub tabs should be active
-    And the active main tab should be Home
+    And the active main tab should be Settings
  
-  Scenario: On Project Home/Hooks
-    Given I visit my project's home page
+  Scenario: On Project Settings/Hooks
+    Given I visit my project's settings page
     And I click the "Hooks" tab
     Then the active sub tab should be Hooks
     And no other sub tabs should be active
-    And the active main tab should be Home
+    And the active main tab should be Settings
  
-  Scenario: On Project Home/Deploy Keys
-    Given I visit my project's home page
+  Scenario: On Project Settings/Deploy Keys
+    Given I visit my project's settings page
     And I click the "Deploy Keys" tab
     Then the active sub tab should be Deploy Keys
     And no other sub tabs should be active
-    And the active main tab should be Home
+    And the active main tab should be Settings
  
   # Sub Tabs: Commits
  
@@ -10,6 +10,10 @@ class ProjectActiveTab &lt; Spinach::FeatureSteps
     ensure_active_main_tab('Home')
   end
  
+  Then 'the active main tab should be Settings' do
+    ensure_active_main_tab('Settings')
+  end
+
   Then 'the active main tab should be Files' do
     ensure_active_main_tab('Files')
   end
@@ -125,6 +125,10 @@ module SharedPaths
     visit project_path(@project)
   end
  
+  Given "I visit my project's settings page" do
+    visit edit_project_path(@project)
+  end
+
   Given "I visit my project's files page" do
     visit project_tree_path(@project, root_ref)
   end
...	...	@@ -49,51 +49,52 @@ Feature: Project active tab
49	49
50	50	Scenario: On Project Home/Show
51	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	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	80	And I click the "Edit" tab
80	81	Then the active sub tab should be Edit
81	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	87	And I click the "Hooks" tab
87	88	Then the active sub tab should be Hooks
88	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	94	And I click the "Deploy Keys" tab
94	95	Then the active sub tab should be Deploy Keys
95	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	99	# Sub Tabs: Commits
99	100
...	...
...	...	@@ -10,6 +10,10 @@ class ProjectActiveTab < Spinach::FeatureSteps
10	10	ensure_active_main_tab('Home')
11	11	end
12	12
	13	+ Then 'the active main tab should be Settings' do
	14	+ ensure_active_main_tab('Settings')
	15	+ end
	16	+
13	17	Then 'the active main tab should be Files' do
14	18	ensure_active_main_tab('Files')
15	19	end
...	...
...	...	@@ -125,6 +125,10 @@ module SharedPaths
125	125	visit project_path(@project)
126	126	end
127	127
	128	+ Given "I visit my project's settings page" do
	129	+ visit edit_project_path(@project)
	130	+ end
	131	+
128	132	Given "I visit my project's files page" do
129	133	visit project_tree_path(@project, root_ref)
130	134	end
...	...