Merge remote-tracking branch 'origin/master' into 43446-new-cluster-page-tabs

14 files changed, 45 insertions, 33 deletions

diff --git a/spec/features/projects/deploy_keys_spec.rb b/spec/features/projects/deploy_keys_spec.rb
index 43a23c42f83..1552a3512dd 100644
--- a/spec/features/projects/deploy_keys_spec.rb
+++ b/spec/features/projects/deploy_keys_spec.rb
@@ -22,7 +22,8 @@ describe 'Project deploy keys', :js do
 
         accept_confirm { find('.ic-remove').click() }
 
-        expect(page).not_to have_selector('.fa-spinner', count: 0)
+        wait_for_requests
+
         expect(page).to have_selector('.deploy-key', count: 0)
       end
     end
diff --git a/spec/features/projects/diffs/diff_show_spec.rb b/spec/features/projects/diffs/diff_show_spec.rb
index c1307ab640f..9bfcb1e816a 100644
--- a/spec/features/projects/diffs/diff_show_spec.rb
+++ b/spec/features/projects/diffs/diff_show_spec.rb
@@ -166,8 +166,7 @@ feature 'Diff file viewer', :js do
 
     context 'expanding the diff' do
       before do
-        # We can't use `click_link` because the "link" doesn't have an `href`.
-        find('a.click-to-expand').click
+        click_button 'Click to expand it.'
 
         wait_for_requests
       end
diff --git a/spec/features/projects/import_export/import_file_spec.rb b/spec/features/projects/import_export/import_file_spec.rb
index 60fe30bd898..d0912e645bc 100644
--- a/spec/features/projects/import_export/import_file_spec.rb
+++ b/spec/features/projects/import_export/import_file_spec.rb
@@ -87,11 +87,13 @@ feature 'Import/Export - project import integration test', :js do
 
   def wiki_exists?(project)
     wiki = ProjectWiki.new(project)
-    File.exist?(wiki.repository.path_to_repo) && !wiki.repository.empty?
+    wiki.repository.exists? && !wiki.repository.empty?
   end
 
   def project_hook_exists?(project)
-    Gitlab::Git::Hook.new('post-receive', project.repository.raw_repository).exists?
+    Gitlab::GitalyClient::StorageSettings.allow_disk_access do
+      Gitlab::Git::Hook.new('post-receive', project.repository.raw_repository).exists?
+    end
   end
 
   def click_import_project_tab
diff --git a/spec/features/projects/issues/user_comments_on_issue_spec.rb b/spec/features/projects/issues/user_comments_on_issue_spec.rb
index c45fdc7642f..353f487485d 100644
--- a/spec/features/projects/issues/user_comments_on_issue_spec.rb
+++ b/spec/features/projects/issues/user_comments_on_issue_spec.rb
@@ -31,11 +31,14 @@ describe "User comments on issue", :js do
     end
 
     it "adds comment with code block" do
-      comment = "```\nCommand [1]: /usr/local/bin/git , see [text](doc/text)\n```"
+      code_block_content = "Command [1]: /usr/local/bin/git , see [text](doc/text)"
+      comment = "```\n#{code_block_content}\n```"
 
       add_note(comment)
 
-      expect(page).to have_content(comment)
+      wait_for_requests
+
+      expect(page.find('pre code').text).to eq code_block_content
     end
   end
 
diff --git a/spec/features/projects/jobs/permissions_spec.rb b/spec/features/projects/jobs/permissions_spec.rb
index 31abadf9bd6..e9588daf37d 100644
--- a/spec/features/projects/jobs/permissions_spec.rb
+++ b/spec/features/projects/jobs/permissions_spec.rb
@@ -88,8 +88,7 @@ describe 'Project Jobs Permissions' do
   describe 'artifacts page' do
     context 'when recent job has artifacts available' do
       before do
-        artifacts = Rails.root.join('spec/fixtures/ci_build_artifacts.zip')
-        archive = fixture_file_upload(artifacts, 'application/zip')
+        archive = fixture_file_upload('spec/fixtures/ci_build_artifacts.zip')
 
         job.update_attributes(legacy_artifacts_file: archive)
       end
diff --git a/spec/features/projects/jobs/user_browses_job_spec.rb b/spec/features/projects/jobs/user_browses_job_spec.rb
index bff5bbe99af..ce0b38b7239 100644
--- a/spec/features/projects/jobs/user_browses_job_spec.rb
+++ b/spec/features/projects/jobs/user_browses_job_spec.rb
@@ -32,8 +32,6 @@ describe 'User browses a job', :js do
     page.within('.erased') do
       expect(page).to have_content('Job has been erased')
     end
-
-    expect(build.project.running_or_pending_build_count).to eq(build.project.builds.running_or_pending.count(:all))
   end
 
   context 'with a failed job' do
diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb
index 9d1c4cbad8b..d2aaf60e72c 100644
--- a/spec/features/projects/jobs_spec.rb
+++ b/spec/features/projects/jobs_spec.rb
@@ -11,7 +11,7 @@ feature 'Jobs', :clean_gitlab_redis_shared_state do
   let(:job2) { create(:ci_build) }
 
   let(:artifacts_file) do
-    fixture_file_upload(Rails.root + 'spec/fixtures/banana_sample.gif', 'image/gif')
+    fixture_file_upload('spec/fixtures/banana_sample.gif', 'image/gif')
   end
 
   before do
diff --git a/spec/features/projects/labels/subscription_spec.rb b/spec/features/projects/labels/subscription_spec.rb
index 70e8d436dcb..fafd338e448 100644
--- a/spec/features/projects/labels/subscription_spec.rb
+++ b/spec/features/projects/labels/subscription_spec.rb
@@ -36,7 +36,7 @@ feature 'Labels subscription' do
       within "#group_label_#{feature.id}" do
         expect(page).not_to have_button 'Unsubscribe'
 
-        click_link_on_dropdown('Group level')
+        click_link_on_dropdown('Subscribe at group level')
 
         expect(page).not_to have_selector('.dropdown-group-label')
         expect(page).to have_button 'Unsubscribe'
@@ -45,7 +45,7 @@ feature 'Labels subscription' do
 
         expect(page).to have_selector('.dropdown-group-label')
 
-        click_link_on_dropdown('Project level')
+        click_link_on_dropdown('Subscribe at project level')
 
         expect(page).not_to have_selector('.dropdown-group-label')
         expect(page).to have_button 'Unsubscribe'
@@ -68,7 +68,7 @@ feature 'Labels subscription' do
     find('.dropdown-group-label').click
 
     page.within('.dropdown-group-label') do
-      find('a.js-subscribe-button', text: text).click
+      find('.js-subscribe-button', text: text).click
     end
   end
 end
diff --git a/spec/features/projects/labels/update_prioritization_spec.rb b/spec/features/projects/labels/update_prioritization_spec.rb
index ae8b1364ec7..359381c391c 100644
--- a/spec/features/projects/labels/update_prioritization_spec.rb
+++ b/spec/features/projects/labels/update_prioritization_spec.rb
@@ -102,16 +102,16 @@ feature 'Prioritize labels' do
       drag_to(selector: '.label-list-item', from_index: 1, to_index: 2)
 
       page.within('.prioritized-labels') do
-        expect(first('li')).to have_content('feature')
-        expect(page.all('li').last).to have_content('bug')
+        expect(first('.label-list-item')).to have_content('feature')
+        expect(page.all('.label-list-item').last).to have_content('bug')
       end
 
       refresh
       wait_for_requests
 
       page.within('.prioritized-labels') do
-        expect(first('li')).to have_content('feature')
-        expect(page.all('li').last).to have_content('bug')
+        expect(first('.label-list-item')).to have_content('feature')
+        expect(page.all('.label-list-item').last).to have_content('bug')
       end
     end
 
diff --git a/spec/features/projects/labels/user_removes_labels_spec.rb b/spec/features/projects/labels/user_removes_labels_spec.rb
index f4fda6de465..efa74015c6e 100644
--- a/spec/features/projects/labels/user_removes_labels_spec.rb
+++ b/spec/features/projects/labels/user_removes_labels_spec.rb
@@ -17,8 +17,9 @@ describe "User removes labels" do
     end
 
     it "removes label" do
-      page.within(".labels") do
+      page.within(".other-labels") do
         page.first(".label-list-item") do
+          first('.js-label-options-dropdown').click
           first(".remove-row").click
           first(:link, "Delete label").click
         end
@@ -36,17 +37,16 @@ describe "User removes labels" do
     end
 
     it "removes all labels" do
-      page.within(".labels") do
-        loop do
-          li = page.first(".label-list-item")
-          break unless li
+      loop do
+        li = page.first(".label-list-item")
+        break unless li
 
-          li.click_link("Delete")
-          click_link("Delete label")
-        end
-
-        expect(page).to have_content("Generate a default set of labels").and have_content("New label")
+        li.find('.js-label-options-dropdown').click
+        li.click_button("Delete")
+        click_link("Delete label")
       end
+
+      expect(page).to have_content("Generate a default set of labels").and have_content("New label")
     end
   end
 end
diff --git a/spec/features/projects/pages_spec.rb b/spec/features/projects/pages_spec.rb
index bdd49f731c7..a2899ec0f48 100644
--- a/spec/features/projects/pages_spec.rb
+++ b/spec/features/projects/pages_spec.rb
@@ -314,8 +314,8 @@ feature 'Pages' do
             project: project,
             pipeline: pipeline,
             ref: 'HEAD',
-            legacy_artifacts_file: fixture_file_upload(Rails.root.join('spec/fixtures/pages.zip')),
-            legacy_artifacts_metadata: fixture_file_upload(Rails.root.join('spec/fixtures/pages.zip.meta'))
+            legacy_artifacts_file: fixture_file_upload(File.join('spec/fixtures/pages.zip')),
+            legacy_artifacts_metadata: fixture_file_upload(File.join('spec/fixtures/pages.zip.meta'))
           )
         end
 
diff --git a/spec/features/projects/pipelines/pipeline_spec.rb b/spec/features/projects/pipelines/pipeline_spec.rb
index 35776a5f23b..ecc7cf84138 100644
--- a/spec/features/projects/pipelines/pipeline_spec.rb
+++ b/spec/features/projects/pipelines/pipeline_spec.rb
@@ -344,6 +344,16 @@ describe 'Pipeline', :js do
       it 'shows build failure logs' do
         expect(page).to have_content('4 examples, 1 failure')
       end
+
+      it 'shows the failure reason' do
+        expect(page).to have_content('There is an unknown failure, please try again')
+      end
+
+      it 'shows retry button for failed build' do
+        page.within(find('.build-failures', match: :first)) do
+          expect(page).to have_link('Retry')
+        end
+      end
     end
 
     context 'when missing build logs' do
diff --git a/spec/features/projects/settings/user_manages_group_links_spec.rb b/spec/features/projects/settings/user_manages_group_links_spec.rb
index fdf42797091..92ce2ca83c7 100644
--- a/spec/features/projects/settings/user_manages_group_links_spec.rb
+++ b/spec/features/projects/settings/user_manages_group_links_spec.rb
@@ -30,7 +30,7 @@ describe 'Projects > Settings > User manages group links' do
     click_link('Share with group')
 
     select2(group_market.id, from: '#link_group_id')
-    select('Master', from: 'link_group_access')
+    select('Maintainer', from: 'link_group_access')
 
     click_button('Share')
 
diff --git a/spec/features/projects/settings/user_manages_project_members_spec.rb b/spec/features/projects/settings/user_manages_project_members_spec.rb
index 8af95522165..d3003753ae6 100644
--- a/spec/features/projects/settings/user_manages_project_members_spec.rb
+++ b/spec/features/projects/settings/user_manages_project_members_spec.rb
@@ -62,7 +62,7 @@ describe 'Projects > Settings > User manages project members' do
 
     page.within('.project-members-groups') do
       expect(page).to have_content('OpenSource')
-      expect(first('.group_member')).to have_content('Master')
+      expect(first('.group_member')).to have_content('Maintainer')
     end
   end
 end