summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Ivan Vargas <jvargas@gitlab.com>2016-12-30 15:09:31 -0600
committerJose Ivan Vargas <jvargas@gitlab.com>2017-01-18 15:19:35 -0600
commitbc7c6c689239a5db3f0c4edcbb77d6b9e586ba22 (patch)
tree4c1324e50ff0b0a4bcb2311fc9a30a90289a05ac
parent1ee4f98694f482099de9f21dc957071e53395313 (diff)
downloadgitlab-ce-bc7c6c689239a5db3f0c4edcbb77d6b9e586ba22.tar.gz
Fixed more tests
-rw-r--r--features/project/active_tab.feature6
-rw-r--r--features/steps/project/active_tab.rb8
-rw-r--r--spec/controllers/projects/settings/integrations_controller_spec.rb2
3 files changed, 8 insertions, 8 deletions
diff --git a/features/project/active_tab.feature b/features/project/active_tab.feature
index 57dda9c2234..d033e6b167b 100644
--- a/features/project/active_tab.feature
+++ b/features/project/active_tab.feature
@@ -39,10 +39,10 @@ Feature: Project Active Tab
# Sub Tabs: Settings
- Scenario: On Project Settings/Hooks
+ Scenario: On Project Settings/Integrations
Given I visit my project's settings page
- And I click the "Hooks" tab
- Then the active sub nav should be Hooks
+ And I click the "Integrations" tab
+ Then the active sub nav should be Integrations
And no other sub navs should be active
And the active main tab should be Settings
diff --git a/features/steps/project/active_tab.rb b/features/steps/project/active_tab.rb
index 58225032859..9f701840f1d 100644
--- a/features/steps/project/active_tab.rb
+++ b/features/steps/project/active_tab.rb
@@ -27,8 +27,8 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
end
end
- step 'I click the "Hooks" tab' do
- click_link('Webhooks')
+ step 'I click the "Integrations" tab' do
+ click_link('Integrations')
end
step 'I click the "Deploy Keys" tab' do
@@ -39,8 +39,8 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
ensure_active_sub_nav('Members')
end
- step 'the active sub nav should be Hooks' do
- ensure_active_sub_nav('Webhooks')
+ step 'the active sub nav should be Integrations' do
+ ensure_active_sub_nav('Integrations')
end
step 'the active sub nav should be Deploy Keys' do
diff --git a/spec/controllers/projects/settings/integrations_controller_spec.rb b/spec/controllers/projects/settings/integrations_controller_spec.rb
index 7a0ad4ae236..f6f0653dbc9 100644
--- a/spec/controllers/projects/settings/integrations_controller_spec.rb
+++ b/spec/controllers/projects/settings/integrations_controller_spec.rb
@@ -1,4 +1,4 @@
-require ('spec_helper')
+require('spec_helper')
describe Projects::Settings::IntegrationsController do
let(:project) { create(:project, :public) }