From 4ae28cb31d9f0915aac647e1befa61067b6932f1 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 15 Dec 2016 17:30:49 +0000
Subject: Changes after review

---
 spec/features/projects/pipelines/pipeline_spec.rb | 91 +++++++++++++++--------
 1 file changed, 58 insertions(+), 33 deletions(-)

(limited to 'spec/features')

diff --git a/spec/features/projects/pipelines/pipeline_spec.rb b/spec/features/projects/pipelines/pipeline_spec.rb
index 80a596d34c9..9d43d264bdf 100644
--- a/spec/features/projects/pipelines/pipeline_spec.rb
+++ b/spec/features/projects/pipelines/pipeline_spec.rb
@@ -39,62 +39,87 @@ describe "Pipelines", feature: true, js: true do
     end
 
     context 'pipeline graph' do
-      it 'shows a running icon and a cancel action for the running build' do
-        title = "#{@running.name} - #{@running.status}"
-
-        page.within("a[data-title='#{title}']") do
-          expect(page).to have_selector('.ci-status-icon-running')
-          expect(page).to have_content('deploy')
+      context 'running build' do
+        it 'shows a running icon and a cancel action for the running build' do
+          page.within('a[data-title="deploy - running"]') do
+            expect(page).to have_selector('.ci-status-icon-running')
+            expect(page).to have_content('deploy')
+          end
+
+          page.within('a[data-title="deploy - running"] + .ci-action-icon-container') do
+            expect(page).to have_selector('.ci-action-icon-container .fa-ban')
+          end
         end
 
-        page.within("a[data-title='#{title}'] + .ci-action-icon-container") do
-          expect(page).to have_selector('.ci-action-icon-container .fa-ban')
-        end
+        it 'should be possible to cancel the running build' do
+          find('a[data-title="deploy - running"] + .ci-action-icon-container').trigger('click')
 
+          expect(page).not_to have_content('Cancel running')
+        end
       end
 
-      it 'shows the success icon and a retry action for the successfull build' do
-        title = "#{@success.name} - #{@success.status}"
+      context 'success build' do
+        it 'shows the success icon and a retry action for the successfull build' do
+          page.within('a[data-title="build - passed"]') do
+            expect(page).to have_selector('.ci-status-icon-success')
+            expect(page).to have_content('build')
+          end
 
-        page.within("a[data-title='#{title}']") do
-          expect(page).to have_selector('.ci-status-icon-success')
-          expect(page).to have_content('build')
+          page.within('a[data-title="build - passed"] + .ci-action-icon-container') do
+            expect(page).to have_selector('.ci-action-icon-container .fa-refresh')
+          end
         end
 
-        page.within("a[data-title='#{title}'] + .ci-action-icon-container") do
-          expect(page).to have_selector('.ci-action-icon-container .fa-refresh')
+        it 'should be possible to retry the success build' do
+          find('a[data-title="build - passed"] + .ci-action-icon-container').trigger('click')
+
+          expect(page).not_to have_content('Retry build')
         end
       end
 
-      it 'shows the failed icon and a retry action for the failed build' do
-        title = "#{@failed.name} - #{@failed.status}"
+      context 'failed build' do
+        it 'shows the failed icon and a retry action for the failed build' do
+          page.within('a[data-title="test - failed"]') do
+            expect(page).to have_selector('.ci-status-icon-failed')
+            expect(page).to have_content('test')
+          end
 
-        page.within("a[data-title='#{title}']") do
-          expect(page).to have_selector('.ci-status-icon-failed')
-          expect(page).to have_content('test')
+          page.within('a[data-title="test - failed"] + .ci-action-icon-container') do
+            expect(page).to have_selector('.ci-action-icon-container .fa-refresh')
+          end
         end
 
-        page.within("a[data-title='#{title}'] + .ci-action-icon-container") do
-          expect(page).to have_selector('.ci-action-icon-container .fa-refresh')
+        it 'should be possible to retry the failed build' do
+          find('a[data-title="test - failed"] + .ci-action-icon-container').trigger('click')
+
+          expect(page).not_to have_content('Retry build')
         end
       end
 
-      it 'shows the skipped icon and a play action for the manual build' do
-        title = "#{@manual.name} - #{@manual.status}"
+      context 'manual build' do
+        it 'shows the skipped icon and a play action for the manual build' do
+          page.within('a[data-title="manual build - manual play action"]') do
+            expect(page).to have_selector('.ci-status-icon-skipped')
+            expect(page).to have_content('manual')
+          end
 
-        page.within("a[data-title='#{title}']") do
-          expect(page).to have_selector('.ci-status-icon-skipped')
-          expect(page).to have_content('manual')
+          page.within('a[data-title="manual build - manual play action"] + .ci-action-icon-container') do
+            expect(page).to have_selector('.ci-action-icon-container .fa-play')
+          end
         end
 
-        page.within("a[data-title='#{title}'] + .ci-action-icon-container") do
-          expect(page).to have_selector('.ci-action-icon-container .fa-play')
+        it 'should be possible to play the manual build' do
+          find('a[data-title="manual build - manual play action"] + .ci-action-icon-container').trigger('click')
+
+          expect(page).not_to have_content('Play build')
         end
       end
 
-      it 'shows the success icon and the generic comit status build' do
-        expect(page).to have_selector('.ci-status-icon-success')
-        expect(page).to have_content('jenkins')
+      context 'external build' do
+        it 'shows the success icon and the generic comit status build' do
+          expect(page).to have_selector('.ci-status-icon-success')
+          expect(page).to have_content('jenkins')
+        end
       end
     end
 
-- 
cgit v1.2.1


From 3f60a276fc36fc7d1c5323c38b33fdbc774cfbbf Mon Sep 17 00:00:00 2001
From: "Luke \"Jared\" Bennett" <lbennett@gitlab.com>
Date: Tue, 13 Dec 2016 16:53:01 +0000
Subject: Added slack slash commands frontend help well

Added tests
---
 .../projects/services/slack_slash_command_spec.rb  | 48 ++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 spec/features/projects/services/slack_slash_command_spec.rb

(limited to 'spec/features')

diff --git a/spec/features/projects/services/slack_slash_command_spec.rb b/spec/features/projects/services/slack_slash_command_spec.rb
new file mode 100644
index 00000000000..dee43d69895
--- /dev/null
+++ b/spec/features/projects/services/slack_slash_command_spec.rb
@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+feature 'Setup Slack slash commands', feature: true do
+  include WaitForAjax
+
+  let(:user) { create(:user) }
+  let(:project) { create(:project) }
+  let(:service) { project.create_slack_slash_commands_service }
+
+  before do
+    project.team << [user, :master]
+    login_as(user)
+  end
+
+  describe 'user visits the slack slash command config page', js: true do
+    it 'shows a help message' do
+      visit edit_namespace_project_service_path(project.namespace, project, service)
+
+      wait_for_ajax
+
+      expect(page).to have_content('This service allows GitLab users to perform common')
+    end
+  end
+
+  describe 'saving a token' do
+    let(:token) { ('a'..'z').to_a.join }
+
+    it 'shows the token after saving' do
+      visit edit_namespace_project_service_path(project.namespace, project, service)
+
+      fill_in 'service_token', with: token
+      click_on 'Save'
+
+      value = find_field('service_token').value
+
+      expect(value).to eq(token)
+    end
+  end
+
+  describe 'the trigger url' do
+    it 'shows the correct url' do
+      visit edit_namespace_project_service_path(project.namespace, project, service)
+
+      value = find_field('url').value
+      expect(value).to match("api/v3/projects/#{project.id}/services/slack_slash_commands/trigger")
+    end
+  end
+end
-- 
cgit v1.2.1


From f9023adbad4939ba597d509e319105659e61734b Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sun, 18 Dec 2016 23:32:53 +0100
Subject: Fix spec failures

---
 spec/features/admin/admin_settings_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'spec/features')

diff --git a/spec/features/admin/admin_settings_spec.rb b/spec/features/admin/admin_settings_spec.rb
index 8cd66f189be..e7a23746244 100644
--- a/spec/features/admin/admin_settings_spec.rb
+++ b/spec/features/admin/admin_settings_spec.rb
@@ -17,9 +17,9 @@ feature 'Admin updates settings', feature: true do
     expect(page).to have_content "Application settings saved successfully"
   end
 
-  scenario 'Change Slack Service template settings' do
+  scenario 'Change Slack Notifications Service template settings' do
     click_link 'Service Templates'
-    click_link 'Slack'
+    click_link 'Slack notifications'
     fill_in 'Webhook', with: 'http://localhost'
     fill_in 'Username', with: 'test_user'
     fill_in 'service_push_channel', with: '#test_channel'
-- 
cgit v1.2.1


From f5ff372140d066d7bcedc0ad0799c723a9012bb0 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sun, 18 Dec 2016 23:34:40 +0100
Subject: Fix failures

---
 spec/features/admin/admin_settings_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'spec/features')

diff --git a/spec/features/admin/admin_settings_spec.rb b/spec/features/admin/admin_settings_spec.rb
index e7a23746244..47fa2f14307 100644
--- a/spec/features/admin/admin_settings_spec.rb
+++ b/spec/features/admin/admin_settings_spec.rb
@@ -30,7 +30,7 @@ feature 'Admin updates settings', feature: true do
 
     expect(page).to have_content 'Application settings saved successfully'
 
-    click_link 'Slack'
+    click_link 'Slack notifications'
 
     page.all('input[type=checkbox]').each do |checkbox|
       expect(checkbox).to be_checked
-- 
cgit v1.2.1


From ad39831049a5d645da2df62de4f9a618fa6f80d7 Mon Sep 17 00:00:00 2001
From: Semyon Pupkov <mail@semyonpupkov.com>
Date: Mon, 19 Dec 2016 16:29:58 +0500
Subject: Move admin projects spinach tests to rspec

https://gitlab.com/gitlab-org/gitlab-ce/issues/23036
---
 spec/features/admin/admin_projects_spec.rb | 99 +++++++++++++++++++++++++++---
 1 file changed, 91 insertions(+), 8 deletions(-)

(limited to 'spec/features')

diff --git a/spec/features/admin/admin_projects_spec.rb b/spec/features/admin/admin_projects_spec.rb
index a36bfd574cb..a5b88812b75 100644
--- a/spec/features/admin/admin_projects_spec.rb
+++ b/spec/features/admin/admin_projects_spec.rb
@@ -1,12 +1,17 @@
 require 'spec_helper'
 
 describe "Admin::Projects", feature: true  do
-  before do
-    @project = create(:project)
+  include Select2Helper
+
+  let(:user) { create :user }
+  let!(:project) { create(:project) }
+  let!(:current_user) do
     login_as :admin
   end
 
   describe "GET /admin/projects" do
+    let!(:archived_project) { create :project, :public, archived: true }
+
     before do
       visit admin_projects_path
     end
@@ -15,20 +20,98 @@ describe "Admin::Projects", feature: true  do
       expect(current_path).to eq(admin_projects_path)
     end
 
-    it "has projects list" do
-      expect(page).to have_content(@project.name)
+    it 'renders projects list without archived project' do
+      expect(page).to have_content(project.name)
+      expect(page).not_to have_content(archived_project.name)
+    end
+
+    it 'renders all projects', js: true do
+      find(:css, '#sort-projects-dropdown').click
+      click_link 'Show archived projects'
+
+      expect(page).to have_content(project.name)
+      expect(page).to have_content(archived_project.name)
+      expect(page).to have_xpath("//span[@class='label label-warning']", text: 'archived')
     end
   end
 
-  describe "GET /admin/projects/:id" do
+  describe "GET /admin/projects/:namespace_id/:id" do
     before do
       visit admin_projects_path
-      click_link "#{@project.name}"
+      click_link "#{project.name}"
+    end
+
+    it do
+      expect(current_path).to eq admin_namespace_project_path(project.namespace, project)
     end
 
     it "has project info" do
-      expect(page).to have_content(@project.path)
-      expect(page).to have_content(@project.name)
+      expect(page).to have_content(project.path)
+      expect(page).to have_content(project.name)
+      expect(page).to have_content(project.name_with_namespace)
+      expect(page).to have_content(project.creator.name)
+    end
+  end
+
+  describe 'transfer project' do
+    before do
+      create(:group, name: 'Web')
+
+      allow_any_instance_of(Projects::TransferService).
+        to receive(:move_uploads_to_new_namespace).and_return(true)
+    end
+
+    it 'transfers project to group web', js: true do
+      visit admin_namespace_project_path(project.namespace, project)
+
+      click_button 'Search for Namespace'
+      click_link 'group: web'
+      click_button 'Transfer'
+
+      expect(page).to have_content("Web / #{project.name}")
+      expect(page).to have_content('Namespace: Web')
+    end
+  end
+
+  describe 'add admin himself to a project' do
+    before do
+      project.team << [user, :master]
+    end
+
+    it 'adds admin a to a project as developer', js: true do
+      visit namespace_project_project_members_path(project.namespace, project)
+
+      page.within '.users-project-form' do
+        select2(current_user.id, from: '#user_ids', multiple: true)
+        select 'Developer', from: 'access_level'
+      end
+
+      click_button 'Add to project'
+
+      page.within '.content-list' do
+        expect(page).to have_content(current_user.name)
+        expect(page).to have_content('Developer')
+      end
+    end
+  end
+
+  describe 'admin remove himself from a project' do
+    before do
+      project.team << [user, :master]
+      project.team << [current_user, :developer]
+    end
+
+    it 'removes admin from the project' do
+      visit namespace_project_project_members_path(project.namespace, project)
+
+      page.within '.content-list' do
+        expect(page).to have_content(current_user.name)
+        expect(page).to have_content('Developer')
+      end
+
+      find(:css, 'li', text: current_user.name).find(:css, 'a.btn-remove').click
+
+      expect(page).not_to have_selector(:css, '.content-list')
     end
   end
 end
-- 
cgit v1.2.1


From 298d05a5c3cc3c2f1daa4d77c45f9c90b53248df Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 19 Dec 2016 15:40:06 +0100
Subject: Improve after feedback

---
 .../projects/services/slack_slash_command_spec.rb      | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'spec/features')

diff --git a/spec/features/projects/services/slack_slash_command_spec.rb b/spec/features/projects/services/slack_slash_command_spec.rb
index dee43d69895..70e203efcf5 100644
--- a/spec/features/projects/services/slack_slash_command_spec.rb
+++ b/spec/features/projects/services/slack_slash_command_spec.rb
@@ -1,18 +1,18 @@
 require 'spec_helper'
 
-feature 'Setup Slack slash commands', feature: true do
+feature 'Slack slash commands', feature: true do
   include WaitForAjax
 
-  let(:user) { create(:user) }
-  let(:project) { create(:project) }
-  let(:service) { project.create_slack_slash_commands_service }
+  given(:user) { create(:user) }
+  given(:project) { create(:project) }
+  given(:service) { project.create_slack_slash_commands_service }
 
-  before do
+  background do
     project.team << [user, :master]
     login_as(user)
   end
 
-  describe 'user visits the slack slash command config page', js: true do
+  scenario 'user visits the slack slash command config page', js: true do
     it 'shows a help message' do
       visit edit_namespace_project_service_path(project.namespace, project, service)
 
@@ -22,8 +22,8 @@ feature 'Setup Slack slash commands', feature: true do
     end
   end
 
-  describe 'saving a token' do
-    let(:token) { ('a'..'z').to_a.join }
+  scenario 'saving a token' do
+    given(:token) { ('a'..'z').to_a.join }
 
     it 'shows the token after saving' do
       visit edit_namespace_project_service_path(project.namespace, project, service)
@@ -37,7 +37,7 @@ feature 'Setup Slack slash commands', feature: true do
     end
   end
 
-  describe 'the trigger url' do
+  scenario 'the trigger url' do
     it 'shows the correct url' do
       visit edit_namespace_project_service_path(project.namespace, project, service)
 
-- 
cgit v1.2.1


From b67ad2db8717a0f9b673f828f9bea5732e7d258a Mon Sep 17 00:00:00 2001
From: "Luke \"Jared\" Bennett" <lbennett@gitlab.com>
Date: Mon, 19 Dec 2016 16:54:14 +0000
Subject: Added integration tests

---
 .../services/mattermost_slash_command_spec.rb      | 67 +++++++++++++++++-----
 1 file changed, 53 insertions(+), 14 deletions(-)

(limited to 'spec/features')

diff --git a/spec/features/projects/services/mattermost_slash_command_spec.rb b/spec/features/projects/services/mattermost_slash_command_spec.rb
index f474e7e891b..4c08d1e6e65 100644
--- a/spec/features/projects/services/mattermost_slash_command_spec.rb
+++ b/spec/features/projects/services/mattermost_slash_command_spec.rb
@@ -10,23 +10,18 @@ feature 'Setup Mattermost slash commands', feature: true do
   before do
     project.team << [user, :master]
     login_as(user)
+    visit edit_namespace_project_service_path(project.namespace, project, service)
   end
 
-  describe 'user visites the mattermost slash command config page', js: true do
+  describe 'user visits the mattermost slash command config page', js: true do
     it 'shows a help message' do
-      visit edit_namespace_project_service_path(project.namespace, project, service)
-
       wait_for_ajax
 
       expect(page).to have_content("This service allows GitLab users to perform common")
     end
-  end
-
-  describe 'saving a token' do
-    let(:token) { ('a'..'z').to_a.join }
 
     it 'shows the token after saving' do
-      visit edit_namespace_project_service_path(project.namespace, project, service)
+      token = ('a'..'z').to_a.join
 
       fill_in 'service_token', with: token
       click_on 'Save'
@@ -35,14 +30,58 @@ feature 'Setup Mattermost slash commands', feature: true do
 
       expect(value).to eq(token)
     end
-  end
 
-  describe 'the trigger url' do
-    it 'shows the correct url' do
-      visit edit_namespace_project_service_path(project.namespace, project, service)
+    describe 'mattermost service is enabled' do
+      let(:info) { find('.services-installation-info') }
+
+      before do
+        Gitlab.config.mattermost.enabled = true
+      end
+
+      it 'shows the correct mattermost url' do
+        expect(page).to have_content Gitlab.config.mattermost.host
+      end
+
+      describe 'mattermost service is active' do
+        before do
+          service.active = true
+        end
+
+        it 'shows that mattermost is active' do
+          expect(info).to have_content 'Installed'
+          expect(info).not_to have_content 'Not installed'
+        end
+
+        it 'shows the edit mattermost button' do
+          expect(info).to have_button 'Edit Mattermost'
+        end
+      end
+
+      describe 'mattermost service is not active' do
+        before do
+          service.active = false
+        end
+
+        it 'shows that mattermost is not active' do
+          expect(info).to have_content 'Not installed'
+        end
+
+        it 'shows the add to mattermost button' do
+          expect(info).to have_button 'Add to Mattermost'
+        end
+      end
+    end
+
+    describe 'mattermost service is not enabled' do
+      before do
+        Gitlab.config.mattermost.enabled = false
+      end
+
+      it 'shows the correct trigger url' do
+        value = find_field('request_url').value
 
-      value = find_field('request_url').value
-      expect(value).to match("api/v3/projects/#{project.id}/services/mattermost_slash_commands/trigger")
+        expect(value).to match("api/v3/projects/#{project.id}/services/mattermost_slash_commands/trigger")
+      end
     end
   end
 end
-- 
cgit v1.2.1


From e06f88effa842c73d3827593f8d28846207bfca0 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 19 Dec 2016 22:12:30 +0100
Subject: Fix specs

---
 .../projects/services/slack_slash_command_spec.rb  | 36 +++++++++-------------
 1 file changed, 14 insertions(+), 22 deletions(-)

(limited to 'spec/features')

diff --git a/spec/features/projects/services/slack_slash_command_spec.rb b/spec/features/projects/services/slack_slash_command_spec.rb
index 70e203efcf5..32b32f7ae8e 100644
--- a/spec/features/projects/services/slack_slash_command_spec.rb
+++ b/spec/features/projects/services/slack_slash_command_spec.rb
@@ -12,37 +12,29 @@ feature 'Slack slash commands', feature: true do
     login_as(user)
   end
 
-  scenario 'user visits the slack slash command config page', js: true do
-    it 'shows a help message' do
-      visit edit_namespace_project_service_path(project.namespace, project, service)
+  scenario 'user visits the slack slash command config page and shows a help message', js: true do
+    visit edit_namespace_project_service_path(project.namespace, project, service)
 
-      wait_for_ajax
+    wait_for_ajax
 
-      expect(page).to have_content('This service allows GitLab users to perform common')
-    end
+    expect(page).to have_content('This service allows GitLab users to perform common')
   end
 
-  scenario 'saving a token' do
-    given(:token) { ('a'..'z').to_a.join }
+  scenario 'shows the token after saving' do
+    visit edit_namespace_project_service_path(project.namespace, project, service)
 
-    it 'shows the token after saving' do
-      visit edit_namespace_project_service_path(project.namespace, project, service)
+    fill_in 'service_token', with: 'token'
+    click_on 'Save'
 
-      fill_in 'service_token', with: token
-      click_on 'Save'
+    value = find_field('service_token').value
 
-      value = find_field('service_token').value
-
-      expect(value).to eq(token)
-    end
+    expect(value).to eq('token')
   end
 
-  scenario 'the trigger url' do
-    it 'shows the correct url' do
-      visit edit_namespace_project_service_path(project.namespace, project, service)
+  scenario 'shows the correct trigger url' do
+    visit edit_namespace_project_service_path(project.namespace, project, service)
 
-      value = find_field('url').value
-      expect(value).to match("api/v3/projects/#{project.id}/services/slack_slash_commands/trigger")
-    end
+    value = find_field('url').value
+    expect(value).to match("api/v3/projects/#{project.id}/services/slack_slash_commands/trigger")
   end
 end
-- 
cgit v1.2.1


From 3db5b7033b13c21b904a21f751bc0f19156ea155 Mon Sep 17 00:00:00 2001
From: Fatih Acet <acetfatih@gmail.com>
Date: Thu, 15 Dec 2016 00:59:04 +0000
Subject: Add terminal UI and controller actions

---
 spec/features/environment_spec.rb  | 32 ++++++++++++++++++++++++++++++++
 spec/features/environments_spec.rb | 28 ++++++++++++++++++++++++++++
 2 files changed, 60 insertions(+)

(limited to 'spec/features')

diff --git a/spec/features/environment_spec.rb b/spec/features/environment_spec.rb
index 0c1939fd885..56f6cd2e095 100644
--- a/spec/features/environment_spec.rb
+++ b/spec/features/environment_spec.rb
@@ -38,6 +38,10 @@ feature 'Environment', :feature do
         scenario 'does not show a re-deploy button for deployment without build' do
           expect(page).not_to have_link('Re-deploy')
         end
+
+        scenario 'does not show terminal button' do
+          expect(page).not_to have_terminal_button
+        end
       end
 
       context 'with related deployable present' do
@@ -60,6 +64,10 @@ feature 'Environment', :feature do
           expect(page).not_to have_link('Stop')
         end
 
+        scenario 'does not show terminal button' do
+          expect(page).not_to have_terminal_button
+        end
+
         context 'with manual action' do
           given(:manual) { create(:ci_build, :manual, pipeline: pipeline, name: 'deploy to production') }
 
@@ -84,6 +92,26 @@ feature 'Environment', :feature do
             end
           end
 
+          context 'with terminal' do
+            let(:project) { create(:kubernetes_project, :test_repo) }
+
+            context 'for project master' do
+              let(:role) { :master }
+
+              scenario 'it shows the terminal button' do
+                expect(page).to have_terminal_button
+              end
+            end
+
+            context 'for developer' do
+              let(:role) { :developer }
+
+              scenario 'does not show terminal button' do
+                expect(page).not_to have_terminal_button
+              end
+            end
+          end
+
           context 'with stop action' do
             given(:manual) { create(:ci_build, :manual, pipeline: pipeline, name: 'close_app') }
             given(:deployment) { create(:deployment, environment: environment, deployable: build, on_stop: 'close_app') }
@@ -158,4 +186,8 @@ feature 'Environment', :feature do
                                              environment.project,
                                              environment)
   end
+
+  def have_terminal_button
+    have_link(nil, href: terminal_namespace_project_environment_path(project.namespace, project, environment))
+  end
 end
diff --git a/spec/features/environments_spec.rb b/spec/features/environments_spec.rb
index e1b97b31e5d..72b984cfab8 100644
--- a/spec/features/environments_spec.rb
+++ b/spec/features/environments_spec.rb
@@ -113,6 +113,10 @@ feature 'Environments page', :feature, :js do
           expect(page).not_to have_css('external-url')
         end
 
+        scenario 'does not show terminal button' do
+          expect(page).not_to have_terminal_button
+        end
+
         context 'with external_url' do
           given(:environment) { create(:environment, project: project, external_url: 'https://git.gitlab.com') }
           given(:build) { create(:ci_build, pipeline: pipeline) }
@@ -145,6 +149,26 @@ feature 'Environments page', :feature, :js do
             end
           end
         end
+
+        context 'with terminal' do
+          let(:project) { create(:kubernetes_project, :test_repo) }
+
+          context 'for project master' do
+            let(:role) { :master }
+
+            scenario 'it shows the terminal button' do
+              expect(page).to have_terminal_button
+            end
+          end
+
+          context 'for developer' do
+            let(:role) { :developer }
+
+            scenario 'does not show terminal button' do
+              expect(page).not_to have_terminal_button
+            end
+          end
+        end
       end
     end
   end
@@ -195,6 +219,10 @@ feature 'Environments page', :feature, :js do
     end
   end
 
+  def have_terminal_button
+    have_link(nil, href: terminal_namespace_project_environment_path(project.namespace, project, environment))
+  end
+
   def visit_environments(project)
     visit namespace_project_environments_path(project.namespace, project)
   end
-- 
cgit v1.2.1


From 8275efa36bd51ad0d46495341d524b215c01bfff Mon Sep 17 00:00:00 2001
From: Felipe Artur <felipefac@gmail.com>
Date: Mon, 19 Dec 2016 19:48:49 -0200
Subject: Fix member with expiration date feature spec

---
 .../projects/members/master_adds_member_with_expiration_date_spec.rb  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'spec/features')

diff --git a/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb b/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb
index 27a83fdcd1f..b7273021c95 100644
--- a/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb
+++ b/spec/features/projects/members/master_adds_member_with_expiration_date_spec.rb
@@ -24,7 +24,7 @@ feature 'Projects > Members > Master adds member with expiration date', feature:
         click_on 'Add to project'
       end
 
-      page.within '.project_member:first-child' do
+      page.within "#project_member_#{new_member.project_members.first.id}" do
         expect(page).to have_content('Expires in 4 days')
       end
     end
@@ -35,7 +35,7 @@ feature 'Projects > Members > Master adds member with expiration date', feature:
       project.team.add_users([new_member.id], :developer, expires_at: '2016-09-06')
       visit namespace_project_project_members_path(project.namespace, project)
 
-      page.within '.project_member:first-child' do
+      page.within "#project_member_#{new_member.project_members.first.id}" do
         find('.js-access-expiration-date').set '2016-08-09'
         wait_for_ajax
         expect(page).to have_content('Expires in 3 days')
-- 
cgit v1.2.1


From 2b0b53cddd7d57ca5dd93437fdffefd7a07af91e Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 20 Dec 2016 11:00:56 +0100
Subject: Add tests for stage API endpoint

---
 spec/features/projects/pipelines/pipelines_spec.rb | 29 ++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'spec/features')

diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb
index f3731698a18..e1c6b4c115c 100644
--- a/spec/features/projects/pipelines/pipelines_spec.rb
+++ b/spec/features/projects/pipelines/pipelines_spec.rb
@@ -152,6 +152,35 @@ describe "Pipelines" do
     end
   end
 
+  describe 'GET /:project/pipelines/stage?name=stage' do
+    let!(:pipeline) do
+      create(:ci_empty_pipeline, project: project, ref: 'master',
+        status: 'running')
+    end
+
+    context 'when accessing existing stage' do
+      let!(:build) do
+        create(:ci_build, pipeline: pipeline, stage: 'build')
+      end
+
+      before do
+        visit stage_namespace_project_pipeline_path(
+          project.namespace, project, pipeline, format: :json, stage: 'build')
+      end
+
+      it { expect(page).to have_http_status(:ok) }
+    end
+
+    context 'when accessing unknown stage' do
+      before do
+        visit stage_namespace_project_pipeline_path(
+          project.namespace, project, pipeline, format: :json, stage: 'test')
+      end
+
+      it { expect(page).to have_http_status(:not_found) }
+    end
+  end
+
   describe 'POST /:project/pipelines' do
     let(:project) { create(:project) }
 
-- 
cgit v1.2.1


From 5ec1c140d991b37d665c47e52dba4a453cc305a4 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 20 Dec 2016 11:26:24 +0100
Subject: Improve specs

---
 spec/features/projects/pipelines/pipelines_spec.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'spec/features')

diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb
index e1c6b4c115c..24e501b0151 100644
--- a/spec/features/projects/pipelines/pipelines_spec.rb
+++ b/spec/features/projects/pipelines/pipelines_spec.rb
@@ -152,7 +152,7 @@ describe "Pipelines" do
     end
   end
 
-  describe 'GET /:project/pipelines/stage?name=stage' do
+  describe 'GET /:project/pipelines/stage.json?name=stage' do
     let!(:pipeline) do
       create(:ci_empty_pipeline, project: project, ref: 'master',
         status: 'running')
@@ -168,7 +168,10 @@ describe "Pipelines" do
           project.namespace, project, pipeline, format: :json, stage: 'build')
       end
 
-      it { expect(page).to have_http_status(:ok) }
+      it do
+        expect(page).to have_http_status(:ok)
+        expect(JSON.parse(page.source)).to include("html")
+      end
     end
 
     context 'when accessing unknown stage' do
-- 
cgit v1.2.1


From 4b9bd188433d77fbaec8ae445716de8084b6a145 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Tue, 20 Dec 2016 13:22:31 +0000
Subject: Adds tests for the mini pipeline graph

---
 spec/features/projects/pipelines/pipelines_spec.rb | 50 ++++++++++++++++++++--
 1 file changed, 47 insertions(+), 3 deletions(-)

(limited to 'spec/features')

diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb
index 24e501b0151..d1ebb12715f 100644
--- a/spec/features/projects/pipelines/pipelines_spec.rb
+++ b/spec/features/projects/pipelines/pipelines_spec.rb
@@ -1,7 +1,8 @@
 require 'spec_helper'
 
-describe "Pipelines" do
+describe "Pipelines", feature: true, js:true do
   include GitlabRoutingHelper
+  include WaitForAjax
 
   let(:project) { create(:empty_project) }
   let(:user) { create(:user) }
@@ -76,7 +77,11 @@ describe "Pipelines" do
       it { expect(page).to have_link('Manual build') }
 
       context 'when playing' do
-        before { click_link('Manual build') }
+
+        before do
+          find('.js-pipeline-dropdown-manual-actions').click
+          click_link('Manual build')
+        end
 
         it { expect(manual.reload).to be_pending }
       end
@@ -131,7 +136,10 @@ describe "Pipelines" do
         before { visit namespace_project_pipelines_path(project.namespace, project) }
 
         it { expect(page).to have_selector('.build-artifacts') }
-        it { expect(page).to have_link(with_artifacts.name) }
+        it do
+          find('.js-pipeline-dropdown-download').click
+          expect(page).to have_link(with_artifacts.name)
+        end
       end
 
       context 'with artifacts expired' do
@@ -150,6 +158,42 @@ describe "Pipelines" do
         it { expect(page).not_to have_selector('.build-artifacts') }
       end
     end
+
+    context 'mini pipleine graph' do
+      let!(:build) do
+        create(:ci_build, pipeline: pipeline, stage: 'build', name: 'build')
+      end
+
+      before do
+        visit namespace_project_pipelines_path(project.namespace, project)
+      end
+
+      it 'should render a mini pipeline graph' do
+        endpoint = stage_namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline, stage: build.name)
+
+        expect(page).to have_selector('.mini-pipeline-graph')
+        expect(page).to have_selector(".js-builds-dropdown-button[data-stage-endpoint='#{endpoint}']")
+      end
+
+      context 'when clicking a graph stage' do
+        it 'should open a dropdown' do
+          find('.js-builds-dropdown-button').trigger('click')
+
+          wait_for_ajax
+
+          expect(page).to have_link build.name
+        end
+
+        it 'should be possible to retry the failed build' do
+          find('.js-builds-dropdown-button').trigger('click')
+
+          wait_for_ajax
+
+          find('a.ci-action-icon-container').trigger('click')
+          expect(page).not_to have_content('Cancel running')
+        end
+      end
+    end
   end
 
   describe 'GET /:project/pipelines/stage.json?name=stage' do
-- 
cgit v1.2.1


From ccfbbf7dfac61557159d743b776f145fe380527a Mon Sep 17 00:00:00 2001
From: "Luke \"Jared\" Bennett" <lbennett@gitlab.com>
Date: Tue, 20 Dec 2016 13:53:24 +0000
Subject: Fix tests

---
 .../services/mattermost_slash_command_spec.rb      | 40 +++-------------------
 1 file changed, 5 insertions(+), 35 deletions(-)

(limited to 'spec/features')

diff --git a/spec/features/projects/services/mattermost_slash_command_spec.rb b/spec/features/projects/services/mattermost_slash_command_spec.rb
index 4c08d1e6e65..521eedeae9e 100644
--- a/spec/features/projects/services/mattermost_slash_command_spec.rb
+++ b/spec/features/projects/services/mattermost_slash_command_spec.rb
@@ -32,49 +32,19 @@ feature 'Setup Mattermost slash commands', feature: true do
     end
 
     describe 'mattermost service is enabled' do
-      let(:info) { find('.services-installation-info') }
-
       before do
-        Gitlab.config.mattermost.enabled = true
-      end
-
-      it 'shows the correct mattermost url' do
-        expect(page).to have_content Gitlab.config.mattermost.host
-      end
-
-      describe 'mattermost service is active' do
-        before do
-          service.active = true
-        end
-
-        it 'shows that mattermost is active' do
-          expect(info).to have_content 'Installed'
-          expect(info).not_to have_content 'Not installed'
-        end
-
-        it 'shows the edit mattermost button' do
-          expect(info).to have_button 'Edit Mattermost'
-        end
+        allow(Gitlab.config.mattermost).to receive(:enabled).and_return(true)
       end
 
-      describe 'mattermost service is not active' do
-        before do
-          service.active = false
-        end
-
-        it 'shows that mattermost is not active' do
-          expect(info).to have_content 'Not installed'
-        end
-
-        it 'shows the add to mattermost button' do
-          expect(info).to have_button 'Add to Mattermost'
-        end
+      it 'shows the add to mattermost button' do
+        expect(page).to have_link 'Add to Mattermost'
       end
     end
 
+
     describe 'mattermost service is not enabled' do
       before do
-        Gitlab.config.mattermost.enabled = false
+        allow(Gitlab.config.mattermost).to receive(:enabled).and_return(false)
       end
 
       it 'shows the correct trigger url' do
-- 
cgit v1.2.1


From 3ef1e76659d0d583a2fd72d86309c2ba6816a316 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Tue, 20 Dec 2016 13:25:58 +0000
Subject: Fix broken test Changes after review

---
 spec/features/projects/pipelines/pipelines_spec.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'spec/features')

diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb
index d1ebb12715f..5a4d14d2f95 100644
--- a/spec/features/projects/pipelines/pipelines_spec.rb
+++ b/spec/features/projects/pipelines/pipelines_spec.rb
@@ -74,7 +74,10 @@ describe "Pipelines", feature: true, js:true do
 
       before { visit namespace_project_pipelines_path(project.namespace, project) }
 
-      it { expect(page).to have_link('Manual build') }
+      it do
+        find('.js-pipeline-dropdown-manual-actions').click
+         expect(page).to have_link('Manual build')
+       end
 
       context 'when playing' do
 
-- 
cgit v1.2.1


From b2daf9f16892f362f57a4a0f7990dbc2f6ab8429 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Tue, 20 Dec 2016 14:17:21 +0000
Subject: Fix broken test

---
 spec/features/projects/pipelines/pipelines_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'spec/features')

diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb
index 5a4d14d2f95..57abbf5d7a4 100644
--- a/spec/features/projects/pipelines/pipelines_spec.rb
+++ b/spec/features/projects/pipelines/pipelines_spec.rb
@@ -217,7 +217,7 @@ describe "Pipelines", feature: true, js:true do
 
       it do
         expect(page).to have_http_status(:ok)
-        expect(JSON.parse(page.source)).to include("html")
+        expect(page.source).to include("html")
       end
     end
 
-- 
cgit v1.2.1


From 9c6480db8993ee6f1d8d1fac29e044dd00d66465 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 20 Dec 2016 15:53:53 +0100
Subject: Move test for HTML stage endpoint to controller specs

---
 spec/features/projects/pipelines/pipeline_spec.rb  |  2 +-
 spec/features/projects/pipelines/pipelines_spec.rb | 32 ----------------------
 2 files changed, 1 insertion(+), 33 deletions(-)

(limited to 'spec/features')

diff --git a/spec/features/projects/pipelines/pipeline_spec.rb b/spec/features/projects/pipelines/pipeline_spec.rb
index 1210e2745db..14e009daba8 100644
--- a/spec/features/projects/pipelines/pipeline_spec.rb
+++ b/spec/features/projects/pipelines/pipeline_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Pipelines", feature: true, js: true do
+describe 'Pipeline', :feature, :js do
   include GitlabRoutingHelper
 
   let(:project) { create(:empty_project) }
diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb
index 57abbf5d7a4..fa8ba21b389 100644
--- a/spec/features/projects/pipelines/pipelines_spec.rb
+++ b/spec/features/projects/pipelines/pipelines_spec.rb
@@ -199,38 +199,6 @@ describe "Pipelines", feature: true, js:true do
     end
   end
 
-  describe 'GET /:project/pipelines/stage.json?name=stage' do
-    let!(:pipeline) do
-      create(:ci_empty_pipeline, project: project, ref: 'master',
-        status: 'running')
-    end
-
-    context 'when accessing existing stage' do
-      let!(:build) do
-        create(:ci_build, pipeline: pipeline, stage: 'build')
-      end
-
-      before do
-        visit stage_namespace_project_pipeline_path(
-          project.namespace, project, pipeline, format: :json, stage: 'build')
-      end
-
-      it do
-        expect(page).to have_http_status(:ok)
-        expect(page.source).to include("html")
-      end
-    end
-
-    context 'when accessing unknown stage' do
-      before do
-        visit stage_namespace_project_pipeline_path(
-          project.namespace, project, pipeline, format: :json, stage: 'test')
-      end
-
-      it { expect(page).to have_http_status(:not_found) }
-    end
-  end
-
   describe 'POST /:project/pipelines' do
     let(:project) { create(:project) }
 
-- 
cgit v1.2.1


From 9c623e3e5d7434f2e30f7c389d13e5af4ede770a Mon Sep 17 00:00:00 2001
From: James Edwards-Jones <jedwardsjones@gitlab.com>
Date: Tue, 20 Dec 2016 14:48:04 +0000
Subject: Added QueryRecorder to test N+1 fix on Milestone#show

---
 spec/features/milestones/show_spec.rb | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 spec/features/milestones/show_spec.rb

(limited to 'spec/features')

diff --git a/spec/features/milestones/show_spec.rb b/spec/features/milestones/show_spec.rb
new file mode 100644
index 00000000000..40b4dc63697
--- /dev/null
+++ b/spec/features/milestones/show_spec.rb
@@ -0,0 +1,26 @@
+require 'rails_helper'
+
+describe 'Milestone show', feature: true do
+  let(:user) { create(:user) }
+  let(:project) { create(:empty_project) }
+  let(:milestone) { create(:milestone, project: project) }
+  let(:labels) { create_list(:label, 2, project: project) }
+  let(:issue_params) { { project: project, assignee: user, author: user, milestone: milestone, labels: labels } }
+
+  before do
+    project.add_user(user, :developer) 
+    login_as(user)
+  end
+
+  def visit_milestone
+    visit namespace_project_milestone_path(project.namespace, project, milestone)
+  end
+
+  it 'avoids N+1 database queries' do
+    create(:labeled_issue, issue_params)
+    control_count = ActiveRecord::QueryRecorder.new { visit_milestone }.count
+    create_list(:labeled_issue, 10, issue_params)
+
+    expect { visit_milestone }.not_to exceed_query_limit(control_count)
+  end
+end
-- 
cgit v1.2.1


From 2b486c2bb27087e4eb306821b9fca95ff8ac74d3 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 20 Dec 2016 20:07:34 +0100
Subject: Fix stage and pipeline specs and rubocop offenses

---
 spec/features/projects/pipelines/pipelines_spec.rb | 25 +++++++++++++++-------
 1 file changed, 17 insertions(+), 8 deletions(-)

(limited to 'spec/features')

diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb
index fa8ba21b389..1ff57f92c4c 100644
--- a/spec/features/projects/pipelines/pipelines_spec.rb
+++ b/spec/features/projects/pipelines/pipelines_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Pipelines", feature: true, js:true do
+describe 'Pipelines', :feature, :js do
   include GitlabRoutingHelper
   include WaitForAjax
 
@@ -70,23 +70,32 @@ describe "Pipelines", feature: true, js:true do
     end
 
     context 'with manual actions' do
-      let!(:manual) { create(:ci_build, :manual, pipeline: pipeline, name: 'manual build', stage: 'test', commands: 'test') }
+      let!(:manual) do
+        create(:ci_build, :manual, pipeline: pipeline,
+                                   name: 'manual build',
+                                   stage: 'test',
+                                   commands: 'test')
+      end
 
-      before { visit namespace_project_pipelines_path(project.namespace, project) }
+      before do
+        visit namespace_project_pipelines_path(project.namespace, project)
+      end
 
-      it do
+      it 'has link to the manual action' do
         find('.js-pipeline-dropdown-manual-actions').click
-         expect(page).to have_link('Manual build')
-       end
 
-      context 'when playing' do
+        expect(page).to have_link('Manual build')
+      end
 
+      context 'when manual action was played' do
         before do
           find('.js-pipeline-dropdown-manual-actions').click
           click_link('Manual build')
         end
 
-        it { expect(manual.reload).to be_pending }
+        it 'enqueues manual action job' do
+          expect(manual.reload).to be_pending
+        end
       end
     end
 
-- 
cgit v1.2.1


From 2393d30da232db04faa8da9e1a958cec22ffb6e8 Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <git@zjvandeweg.nl>
Date: Tue, 20 Dec 2016 20:11:02 +0100
Subject: Fix rubocop errors [ci skip]

---
 spec/features/projects/services/mattermost_slash_command_spec.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'spec/features')

diff --git a/spec/features/projects/services/mattermost_slash_command_spec.rb b/spec/features/projects/services/mattermost_slash_command_spec.rb
index 521eedeae9e..73ecf86aded 100644
--- a/spec/features/projects/services/mattermost_slash_command_spec.rb
+++ b/spec/features/projects/services/mattermost_slash_command_spec.rb
@@ -41,7 +41,6 @@ feature 'Setup Mattermost slash commands', feature: true do
       end
     end
 
-
     describe 'mattermost service is not enabled' do
       before do
         allow(Gitlab.config.mattermost).to receive(:enabled).and_return(false)
-- 
cgit v1.2.1


From 4a03fae930a58b485ee610ce9e6058a2c2dd3d6e Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <git@zjvandeweg.nl>
Date: Tue, 20 Dec 2016 20:56:46 +0100
Subject: Fix rspec tests due to different API

[ci skip]
---
 .../projects/services/mattermost_slash_command_spec.rb       | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

(limited to 'spec/features')

diff --git a/spec/features/projects/services/mattermost_slash_command_spec.rb b/spec/features/projects/services/mattermost_slash_command_spec.rb
index 73ecf86aded..274d50e7ce4 100644
--- a/spec/features/projects/services/mattermost_slash_command_spec.rb
+++ b/spec/features/projects/services/mattermost_slash_command_spec.rb
@@ -4,10 +4,12 @@ feature 'Setup Mattermost slash commands', feature: true do
   include WaitForAjax
 
   let(:user) { create(:user) }
-  let(:project) { create(:project) }
+  let(:project) { create(:empty_project) }
   let(:service) { project.create_mattermost_slash_commands_service }
+  let(:mattermost_enabled) { true }
 
   before do
+    Settings.mattermost['enabled'] = mattermost_enabled
     project.team << [user, :master]
     login_as(user)
     visit edit_namespace_project_service_path(project.namespace, project, service)
@@ -32,19 +34,13 @@ feature 'Setup Mattermost slash commands', feature: true do
     end
 
     describe 'mattermost service is enabled' do
-      before do
-        allow(Gitlab.config.mattermost).to receive(:enabled).and_return(true)
-      end
-
       it 'shows the add to mattermost button' do
         expect(page).to have_link 'Add to Mattermost'
       end
     end
 
     describe 'mattermost service is not enabled' do
-      before do
-        allow(Gitlab.config.mattermost).to receive(:enabled).and_return(false)
-      end
+      let(:mattermost_enabled) { false }
 
       it 'shows the correct trigger url' do
         value = find_field('request_url').value
-- 
cgit v1.2.1


From fed29117de6f30055d88daaa497ec18f85397ad6 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Tue, 20 Dec 2016 19:14:33 -0200
Subject: Rename SlackNotificationService back to SlackService

---
 .../import_export/test_project_export.tar.gz       | Bin 679415 -> 682154 bytes
 .../projects/services/slack_service_spec.rb        |   4 ++--
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'spec/features')

diff --git a/spec/features/projects/import_export/test_project_export.tar.gz b/spec/features/projects/import_export/test_project_export.tar.gz
index d3165d07d7b..7655c2b351f 100644
Binary files a/spec/features/projects/import_export/test_project_export.tar.gz and b/spec/features/projects/import_export/test_project_export.tar.gz differ
diff --git a/spec/features/projects/services/slack_service_spec.rb b/spec/features/projects/services/slack_service_spec.rb
index 320ed13a01d..16541f51d98 100644
--- a/spec/features/projects/services/slack_service_spec.rb
+++ b/spec/features/projects/services/slack_service_spec.rb
@@ -2,8 +2,8 @@ require 'spec_helper'
 
 feature 'Projects > Slack service > Setup events', feature: true do
   let(:user) { create(:user) }
-  let(:service) { SlackNotificationService.new }
-  let(:project) { create(:project, slack_notification_service: service) }
+  let(:service) { SlackService.new }
+  let(:project) { create(:project, slack_service: service) }
 
   background do
     service.fields
-- 
cgit v1.2.1


From dfa842ce1de5b93bca2f336f3cf8c8769a555853 Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Thu, 24 Nov 2016 15:45:34 +0000
Subject: Removes builds tab from merge request

Fix specs
---
 spec/features/merge_requests/created_from_fork_spec.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'spec/features')

diff --git a/spec/features/merge_requests/created_from_fork_spec.rb b/spec/features/merge_requests/created_from_fork_spec.rb
index 142649297cc..73c5ef31edc 100644
--- a/spec/features/merge_requests/created_from_fork_spec.rb
+++ b/spec/features/merge_requests/created_from_fork_spec.rb
@@ -54,14 +54,14 @@ feature 'Merge request created from fork' do
 
     scenario 'user visits a pipelines page', js: true do
       visit_merge_request(merge_request)
-      page.within('.merge-request-tabs') { click_link 'Builds' }
+      page.within('.merge-request-tabs') { click_link 'Pipelines' }
 
       page.within('table.ci-table') do
-        expect(page).to have_content 'rspec'
-        expect(page).to have_content 'spinach'
+        expect(page).to have_content pipeline.status
+        expect(page).to have_content pipeline.id
       end
 
-      expect(find_link('Cancel running')[:href])
+      expect(page.find('a.btn-remove')[:href])
         .to include fork_project.path_with_namespace
     end
   end
-- 
cgit v1.2.1


From 7086dac42fff6e32bc38b389ffa104d9c21a159c Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Tue, 29 Nov 2016 13:02:28 +0000
Subject: Changes after review

Fix broken test

Remove spinach tests for the builds tab
---
 spec/features/projects/commit/builds_spec.rb | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'spec/features')

diff --git a/spec/features/projects/commit/builds_spec.rb b/spec/features/projects/commit/builds_spec.rb
index fcdf7870f34..33f1c323af1 100644
--- a/spec/features/projects/commit/builds_spec.rb
+++ b/spec/features/projects/commit/builds_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-feature 'project commit builds' do
+feature 'project commit pipelines' do
   given(:project) { create(:project) }
 
   background do
@@ -16,11 +16,13 @@ feature 'project commit builds' do
                            ref: 'master')
     end
 
-    scenario 'user views commit builds page' do
-      visit builds_namespace_project_commit_path(project.namespace,
-                                                 project, project.commit.sha)
+    scenario 'user views commit pipelines page' do
+      visit pipelines_namespace_project_commit_path(project.namespace, project, project.commit.sha)
 
-      expect(page).to have_content('Builds')
+      page.within('.table-holder') do
+        expect(page).to have_content project.pipelines[0].status # pipeline status
+        expect(page).to have_content project.pipelines[0].id     # pipeline ids
+      end
     end
   end
 end
-- 
cgit v1.2.1


From a9f85d11a584a5a9ad99aaf6366f22fd6f6d0957 Mon Sep 17 00:00:00 2001
From: "Luke \"Jared\" Bennett" <lbennett@gitlab.com>
Date: Wed, 21 Dec 2016 11:03:52 +0000
Subject: Fix space issue and add test

---
 spec/features/issues/gfm_autocomplete_spec.rb | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'spec/features')

diff --git a/spec/features/issues/gfm_autocomplete_spec.rb b/spec/features/issues/gfm_autocomplete_spec.rb
index da64827b377..df3a467cbb7 100644
--- a/spec/features/issues/gfm_autocomplete_spec.rb
+++ b/spec/features/issues/gfm_autocomplete_spec.rb
@@ -39,7 +39,6 @@ feature 'GFM autocomplete', feature: true, js: true do
       page.within '.timeline-content-form' do
         note.native.send_keys('')
         note.native.send_keys("~#{label.title[0]}")
-        sleep 1
         note.click
       end
 
@@ -53,7 +52,6 @@ feature 'GFM autocomplete', feature: true, js: true do
       page.within '.timeline-content-form' do
         note.native.send_keys('')
         note.native.send_keys("@#{user.username[0]}")
-        sleep 1
         note.click
       end
 
@@ -67,7 +65,6 @@ feature 'GFM autocomplete', feature: true, js: true do
       page.within '.timeline-content-form' do
         note.native.send_keys('')
         note.native.send_keys(":cartwheel")
-        sleep 1
         note.click
       end
 
@@ -76,6 +73,22 @@ feature 'GFM autocomplete', feature: true, js: true do
       expect_to_wrap(false, emoji_item, note, 'cartwheel_tone1')
     end
 
+    it 'doesn\'t open autocomplete after non-word character' do
+      page.within '.timeline-content-form' do
+        find('#note_note').native.send_keys("@#{user.username[0..2]}!")
+      end
+
+      expect(page).not_to have_selector('.atwho-view')
+    end
+
+    it 'doesn\'t open autocomplete if there is no space before' do
+      page.within '.timeline-content-form' do
+        find('#note_note').native.send_keys("hello:#{user.username[0..2]}")
+      end
+
+      expect(page).not_to have_selector('.atwho-view')
+    end
+
     def expect_to_wrap(should_wrap, item, note, value)
       expect(item).to have_content(value)
       expect(item).not_to have_content("\"#{value}\"")
@@ -89,12 +102,4 @@ feature 'GFM autocomplete', feature: true, js: true do
       end
     end
   end
-
-  it 'doesnt open autocomplete after non-word character' do
-    page.within '.timeline-content-form' do
-      find('#note_note').native.send_keys("@#{user.username[0..2]}!")
-    end
-
-    expect(page).not_to have_selector('.atwho-view')
-  end
 end
-- 
cgit v1.2.1


From 9809a9af8a3980f8a65262295cfd9701e793ac11 Mon Sep 17 00:00:00 2001
From: Adam Niedzielski <adamsunday@gmail.com>
Date: Wed, 21 Dec 2016 16:21:55 +0100
Subject: Introduce "Set up autodeploy" button to help configure GitLab CI for
 deployment

The button allows to choose a ".gitlab-ci.yml" template that automatically
sets up the deployment of an application.
The currently supported template is Kubernetes template.
---
 spec/features/auto_deploy_spec.rb  | 56 ++++++++++++++++++++++++++++++++++++++
 spec/features/environment_spec.rb  |  2 +-
 spec/features/environments_spec.rb |  2 +-
 3 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 spec/features/auto_deploy_spec.rb

(limited to 'spec/features')

diff --git a/spec/features/auto_deploy_spec.rb b/spec/features/auto_deploy_spec.rb
new file mode 100644
index 00000000000..92c5b1cbb3b
--- /dev/null
+++ b/spec/features/auto_deploy_spec.rb
@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe 'Auto deploy' do
+  include WaitForAjax
+
+  let(:user) { create(:user) }
+  let(:project) { create(:project, :kubernetes) }
+
+  before do
+    project.team << [user, :master]
+    login_as user
+  end
+
+  context 'when no deployment service is active' do
+    before do
+      project.kubernetes_service.update!(active: false)
+    end
+
+    it 'does not show a button to set up auto deploy' do
+      visit namespace_project_path(project.namespace, project)
+      expect(page).to have_no_content('Set up autodeploy')
+    end
+  end
+
+  context 'when a deployment service is active' do
+    before do
+      project.kubernetes_service.update!(active: true)
+      visit namespace_project_path(project.namespace, project)
+    end
+
+    it 'shows a button to set up auto deploy' do
+      expect(page).to have_link('Set up autodeploy')
+    end
+
+    it 'includes Kubernetes as an available template', js: true do
+      click_link 'Set up autodeploy'
+      click_button 'Choose a GitLab CI Yaml template'
+
+      within '.gitlab-ci-yml-selector' do
+        expect(page).to have_content('Kubernetes')
+      end
+    end
+
+    it 'creates a merge request using "autodeploy" branch', js: true do
+      click_link 'Set up autodeploy'
+      click_button 'Choose a GitLab CI Yaml template'
+      within '.gitlab-ci-yml-selector' do
+        click_on 'Kubernetes'
+      end
+      wait_for_ajax
+      click_button 'Commit Changes'
+
+      expect(page).to have_content('New Merge Request From autodeploy into master')
+    end
+  end
+end
diff --git a/spec/features/environment_spec.rb b/spec/features/environment_spec.rb
index 56f6cd2e095..c7411f1f4ac 100644
--- a/spec/features/environment_spec.rb
+++ b/spec/features/environment_spec.rb
@@ -93,7 +93,7 @@ feature 'Environment', :feature do
           end
 
           context 'with terminal' do
-            let(:project) { create(:kubernetes_project, :test_repo) }
+            let(:project) { create(:empty_project, :kubernetes, :test_repo) }
 
             context 'for project master' do
               let(:role) { :master }
diff --git a/spec/features/environments_spec.rb b/spec/features/environments_spec.rb
index 72b984cfab8..e1387e44be8 100644
--- a/spec/features/environments_spec.rb
+++ b/spec/features/environments_spec.rb
@@ -151,7 +151,7 @@ feature 'Environments page', :feature, :js do
         end
 
         context 'with terminal' do
-          let(:project) { create(:kubernetes_project, :test_repo) }
+          let(:project) { create(:empty_project, :kubernetes, :test_repo) }
 
           context 'for project master' do
             let(:role) { :master }
-- 
cgit v1.2.1


From 3cb8f01b9a33925bd65347f4a97c6db2f787589c Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 21 Dec 2016 21:13:13 +0100
Subject: Added Autodeploy script for OpenShift

---
 spec/features/auto_deploy_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'spec/features')

diff --git a/spec/features/auto_deploy_spec.rb b/spec/features/auto_deploy_spec.rb
index 92c5b1cbb3b..e581aa411b0 100644
--- a/spec/features/auto_deploy_spec.rb
+++ b/spec/features/auto_deploy_spec.rb
@@ -37,7 +37,7 @@ describe 'Auto deploy' do
       click_button 'Choose a GitLab CI Yaml template'
 
       within '.gitlab-ci-yml-selector' do
-        expect(page).to have_content('Kubernetes')
+        expect(page).to have_content('OpenShift')
       end
     end
 
@@ -45,7 +45,7 @@ describe 'Auto deploy' do
       click_link 'Set up autodeploy'
       click_button 'Choose a GitLab CI Yaml template'
       within '.gitlab-ci-yml-selector' do
-        click_on 'Kubernetes'
+        click_on 'OpenShift'
       end
       wait_for_ajax
       click_button 'Commit Changes'
-- 
cgit v1.2.1


From 4a1e1281ac862a0c86d62473ab09d559c7ec5485 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 21 Dec 2016 21:25:23 +0100
Subject: Revert conflicting EE changes

---
 spec/features/auto_deploy_spec.rb  | 10 +++++++++-
 spec/features/environment_spec.rb  |  2 +-
 spec/features/environments_spec.rb |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'spec/features')

diff --git a/spec/features/auto_deploy_spec.rb b/spec/features/auto_deploy_spec.rb
index e581aa411b0..92f1ab90881 100644
--- a/spec/features/auto_deploy_spec.rb
+++ b/spec/features/auto_deploy_spec.rb
@@ -4,9 +4,17 @@ describe 'Auto deploy' do
   include WaitForAjax
 
   let(:user) { create(:user) }
-  let(:project) { create(:project, :kubernetes) }
+  let(:project) { create(:project) }
 
   before do
+    project.create_kubernetes_service(
+      active: true,
+      properties: {
+        namespace: project.path,
+        api_url: 'https://kubernetes.example.com',
+        token: 'a' * 40,
+      }
+    )
     project.team << [user, :master]
     login_as user
   end
diff --git a/spec/features/environment_spec.rb b/spec/features/environment_spec.rb
index c7411f1f4ac..56f6cd2e095 100644
--- a/spec/features/environment_spec.rb
+++ b/spec/features/environment_spec.rb
@@ -93,7 +93,7 @@ feature 'Environment', :feature do
           end
 
           context 'with terminal' do
-            let(:project) { create(:empty_project, :kubernetes, :test_repo) }
+            let(:project) { create(:kubernetes_project, :test_repo) }
 
             context 'for project master' do
               let(:role) { :master }
diff --git a/spec/features/environments_spec.rb b/spec/features/environments_spec.rb
index e1387e44be8..72b984cfab8 100644
--- a/spec/features/environments_spec.rb
+++ b/spec/features/environments_spec.rb
@@ -151,7 +151,7 @@ feature 'Environments page', :feature, :js do
         end
 
         context 'with terminal' do
-          let(:project) { create(:empty_project, :kubernetes, :test_repo) }
+          let(:project) { create(:kubernetes_project, :test_repo) }
 
           context 'for project master' do
             let(:role) { :master }
-- 
cgit v1.2.1