Add latest changes from gitlab-org/gitlab@12-3-stable

6 files changed, 31 insertions, 31 deletions

diff --git a/spec/features/clusters/cluster_detail_page_spec.rb b/spec/features/clusters/cluster_detail_page_spec.rb
index 927862689c1..683c57a97f8 100644
--- a/spec/features/clusters/cluster_detail_page_spec.rb
+++ b/spec/features/clusters/cluster_detail_page_spec.rb
@@ -13,7 +13,7 @@ describe 'Clusterable > Show page' do
     sign_in(current_user)
   end
 
-  shared_examples 'show page' do
+  shared_examples 'editing domain' do
     before do
       clusterable.add_maintainer(current_user)
     end
@@ -53,12 +53,6 @@ describe 'Clusterable > Show page' do
         end
       end
     end
-
-    it 'does not show the environments tab' do
-      visit cluster_path
-
-      expect(page).not_to have_selector('.js-cluster-nav-environments', text: 'Environments')
-    end
   end
 
   shared_examples 'editing a GCP cluster' do
@@ -119,30 +113,42 @@ describe 'Clusterable > Show page' do
   end
 
   context 'when clusterable is a project' do
-    let(:clusterable) { create(:project) }
-    let(:cluster_path) { project_cluster_path(clusterable, cluster) }
-    let(:cluster) { create(:cluster, :provided_by_gcp, :project, projects: [clusterable]) }
-
-    it_behaves_like 'show page'
+    it_behaves_like 'editing domain' do
+      let(:clusterable) { create(:project) }
+      let(:cluster) { create(:cluster, :provided_by_gcp, :project, projects: [clusterable]) }
+      let(:cluster_path) { project_cluster_path(clusterable, cluster) }
+    end
 
-    it_behaves_like 'editing a GCP cluster'
+    it_behaves_like 'editing a GCP cluster' do
+      let(:clusterable) { create(:project) }
+      let(:cluster) { create(:cluster, :provided_by_gcp, :project, projects: [clusterable]) }
+      let(:cluster_path) { project_cluster_path(clusterable, cluster) }
+    end
 
     it_behaves_like 'editing a user-provided cluster' do
+      let(:clusterable) { create(:project) }
       let(:cluster) { create(:cluster, :provided_by_user, :project, projects: [clusterable]) }
+      let(:cluster_path) { project_cluster_path(clusterable, cluster) }
     end
   end
 
   context 'when clusterable is a group' do
-    let(:clusterable) { create(:group) }
-    let(:cluster_path) { group_cluster_path(clusterable, cluster) }
-    let(:cluster) { create(:cluster, :provided_by_gcp, :group, groups: [clusterable]) }
-
-    it_behaves_like 'show page'
+    it_behaves_like 'editing domain' do
+      let(:clusterable) { create(:group) }
+      let(:cluster) { create(:cluster, :provided_by_gcp, :group, groups: [clusterable]) }
+      let(:cluster_path) { group_cluster_path(clusterable, cluster) }
+    end
 
-    it_behaves_like 'editing a GCP cluster'
+    it_behaves_like 'editing a GCP cluster' do
+      let(:clusterable) { create(:group) }
+      let(:cluster) { create(:cluster, :provided_by_gcp, :group, groups: [clusterable]) }
+      let(:cluster_path) { group_cluster_path(clusterable, cluster) }
+    end
 
     it_behaves_like 'editing a user-provided cluster' do
+      let(:clusterable) { create(:group) }
       let(:cluster) { create(:cluster, :provided_by_user, :group, groups: [clusterable]) }
+      let(:cluster_path) { group_cluster_path(clusterable, cluster) }
     end
   end
 end
diff --git a/spec/features/container_registry_spec.rb b/spec/features/container_registry_spec.rb
index dfd08483430..aefdc4d6d4f 100644
--- a/spec/features/container_registry_spec.rb
+++ b/spec/features/container_registry_spec.rb
@@ -53,9 +53,7 @@ describe 'Container Registry', :js do
       find('.js-toggle-repo').click
       wait_for_requests
 
-      service = double('service')
-      expect(service).to receive(:execute).with(container_repository) { { status: :success } }
-      expect(Projects::ContainerRepository::DeleteTagsService).to receive(:new).with(container_repository.project, user, tags: ['latest']) { service }
+      expect_any_instance_of(ContainerRegistry::Tag).to receive(:delete).and_return(true)
 
       click_on(class: 'js-delete-registry-row', visible: false)
       expect(find('.modal .modal-title')).to have_content 'Remove image'
diff --git a/spec/features/issues/gfm_autocomplete_spec.rb b/spec/features/issues/gfm_autocomplete_spec.rb
index 0ff3809a915..cc834df367b 100644
--- a/spec/features/issues/gfm_autocomplete_spec.rb
+++ b/spec/features/issues/gfm_autocomplete_spec.rb
@@ -27,8 +27,6 @@ describe 'GFM autocomplete', :js do
   it 'updates issue description with GFM reference' do
     find('.js-issuable-edit').click
 
-    wait_for_requests
-
     simulate_input('#issue-description', "@#{user.name[0...3]}")
 
     wait_for_requests
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index f9e83af352d..5bdd9113b06 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -470,6 +470,9 @@ describe 'Issues' do
             expect(page).to have_content 'None'
           end
 
+          # wait_for_requests does not work with vue-resource at the moment
+          sleep 1
+
           expect(issue.reload.assignees).to be_empty
         end
 
diff --git a/spec/features/projects/import_export/export_file_spec.rb b/spec/features/projects/import_export/export_file_spec.rb
index 7618a2bdea3..a1002f38936 100644
--- a/spec/features/projects/import_export/export_file_spec.rb
+++ b/spec/features/projects/import_export/export_file_spec.rb
@@ -49,7 +49,8 @@ describe 'Import/Export - project export integration test', :js do
 
       expect(page).to have_content('Download export')
 
-      expect(project.export_status).to eq(:finished)
+      expect(file_permissions(project.export_path)).to eq(0700)
+
       expect(project.export_file.path).to include('tar.gz')
 
       in_directory_with_expanded_export(project) do |exit_status, tmpdir|
diff --git a/spec/features/runners_spec.rb b/spec/features/runners_spec.rb
index 0049d3ca7c9..63d21d94b5f 100644
--- a/spec/features/runners_spec.rb
+++ b/spec/features/runners_spec.rb
@@ -272,12 +272,6 @@ describe 'Runners' do
 
         expect(page).to have_content 'This group does not provide any group Runners yet'
       end
-
-      it 'user can see a link to install runners on kubernetes clusters' do
-        visit group_settings_ci_cd_path(group)
-
-        expect(page).to have_link('Install Runner on Kubernetes', href: group_clusters_path(group))
-      end
     end
 
     context 'group with a runner' do