Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 12 deletions

diff --git a/spec/features/projects/services/user_activates_atlassian_bamboo_ci_spec.rb b/spec/features/projects/services/user_activates_atlassian_bamboo_ci_spec.rb
index c694eeb1cc2..28ed08f71b6 100644
--- a/spec/features/projects/services/user_activates_atlassian_bamboo_ci_spec.rb
+++ b/spec/features/projects/services/user_activates_atlassian_bamboo_ci_spec.rb
@@ -3,31 +3,26 @@
 require 'spec_helper'
 
 describe 'User activates Atlassian Bamboo CI' do
-  let(:project) { create(:project) }
-  let(:user) { create(:user) }
+  include_context 'project service activation'
 
   before do
-    project.add_maintainer(user)
-    sign_in(user)
-
-    visit(project_settings_integrations_path(project))
-
-    click_link('Atlassian Bamboo CI')
+    stub_request(:get, /.*bamboo.example.com.*/)
   end
 
-  it 'activates service' do
-    check('Active')
+  it 'activates service', :js do
+    visit_project_integration('Atlassian Bamboo CI')
     fill_in('Bamboo url', with: 'http://bamboo.example.com')
     fill_in('Build key', with: 'KEY')
     fill_in('Username', with: 'user')
     fill_in('Password', with: 'verySecret')
-    click_button('Save')
+
+    click_test_integration
 
     expect(page).to have_content('Atlassian Bamboo CI activated.')
 
     # Password field should not be filled in.
     click_link('Atlassian Bamboo CI')
 
-    expect(find_field('Enter new password').value).to be_nil
+    expect(find_field('Enter new password').value).to be_blank
   end
 end