Add latest changes from gitlab-org/gitlab@13-1-stable-ee

4 files changed, 59 insertions, 8 deletions

diff --git a/spec/views/projects/edit.html.haml_spec.rb b/spec/views/projects/edit.html.haml_spec.rb
index e95dec56a2d..0c0f74a41f0 100644
--- a/spec/views/projects/edit.html.haml_spec.rb
+++ b/spec/views/projects/edit.html.haml_spec.rb
@@ -32,26 +32,28 @@ describe 'projects/edit' do
     it 'displays all possible variables' do
       render
 
-      expect(rendered).to have_content('%{project_path}')
-      expect(rendered).to have_content('%{project_name}')
-      expect(rendered).to have_content('%{file_path}')
       expect(rendered).to have_content('%{branch_name}')
-      expect(rendered).to have_content('%{username}')
+      expect(rendered).to have_content('%{files_count}')
+      expect(rendered).to have_content('%{file_paths}')
+      expect(rendered).to have_content('%{project_name}')
+      expect(rendered).to have_content('%{project_path}')
       expect(rendered).to have_content('%{user_full_name}')
+      expect(rendered).to have_content('%{username}')
+      expect(rendered).to have_content('%{suggestions_count}')
     end
 
     it 'displays a placeholder if none is set' do
       render
 
-      expect(rendered).to have_field('project[suggestion_commit_message]', placeholder: 'Apply suggestion to %{file_path}')
+      expect(rendered).to have_field('project[suggestion_commit_message]', placeholder: "Apply %{suggestions_count} suggestion(s) to %{files_count} file(s)")
     end
 
     it 'displays the user entered value' do
-      project.update!(suggestion_commit_message: 'refactor: changed %{file_path}')
+      project.update!(suggestion_commit_message: 'refactor: changed %{file_paths}')
 
       render
 
-      expect(rendered).to have_field('project[suggestion_commit_message]', with: 'refactor: changed %{file_path}')
+      expect(rendered).to have_field('project[suggestion_commit_message]', with: 'refactor: changed %{file_paths}')
     end
   end
 
diff --git a/spec/views/projects/issues/import_csv/_button.html.haml_spec.rb b/spec/views/projects/issues/import_csv/_button.html.haml_spec.rb
new file mode 100644
index 00000000000..440edd376e0
--- /dev/null
+++ b/spec/views/projects/issues/import_csv/_button.html.haml_spec.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'projects/issues/import_csv/_button' do
+  include Devise::Test::ControllerHelpers
+
+  context 'when the user does not have edit permissions' do
+    before do
+      render
+    end
+
+    it 'shows a dropdown button to import CSV' do
+      expect(rendered).to have_text('Import CSV')
+    end
+
+    it 'does not show a button to import from Jira' do
+      expect(rendered).not_to have_text('Import from Jira')
+    end
+  end
+
+  context 'when the user has edit permissions' do
+    let(:project) { create(:project) }
+    let(:current_user) { create(:user, maintainer_projects: [project]) }
+
+    before do
+      allow(view).to receive(:project_import_jira_path).and_return('import/jira')
+      allow(view).to receive(:current_user).and_return(current_user)
+
+      assign(:project, project)
+
+      render
+    end
+
+    it 'shows a dropdown button to import CSV' do
+      expect(rendered).to have_text('Import CSV')
+    end
+
+    it 'shows a button to import from Jira' do
+      expect(rendered).to have_text('Import from Jira')
+    end
+  end
+end
diff --git a/spec/views/projects/merge_requests/show.html.haml_spec.rb b/spec/views/projects/merge_requests/show.html.haml_spec.rb
index 665003d137a..e0acf5d1507 100644
--- a/spec/views/projects/merge_requests/show.html.haml_spec.rb
+++ b/spec/views/projects/merge_requests/show.html.haml_spec.rb
@@ -3,6 +3,10 @@
 require 'spec_helper'
 
 describe 'projects/merge_requests/show.html.haml' do
+  before do
+    allow(view).to receive(:experiment_enabled?).and_return(false)
+  end
+
   include_context 'merge request show action'
 
   describe 'merge request assignee sidebar' do
diff --git a/spec/views/projects/services/_form.haml_spec.rb b/spec/views/projects/services/_form.haml_spec.rb
index a3faa92b50e..720e0aaf450 100644
--- a/spec/views/projects/services/_form.haml_spec.rb
+++ b/spec/views/projects/services/_form.haml_spec.rb
@@ -15,7 +15,8 @@ describe 'projects/services/_form' do
 
     allow(view).to receive_messages(current_user: user,
                                     can?: true,
-                                    current_application_settings: Gitlab::CurrentSettings.current_application_settings)
+                                    current_application_settings: Gitlab::CurrentSettings.current_application_settings,
+                                    request: double(referrer: '/services'))
   end
 
   context 'commit_events and merge_request_events' do
@@ -30,6 +31,7 @@ describe 'projects/services/_form' do
 
       expect(rendered).to have_content('Event will be triggered when a commit is created/updated')
       expect(rendered).to have_content('Event will be triggered when a merge request is created/updated/merged')
+      expect(rendered).to have_css("input[name='redirect_to'][value='/services']", count: 1, visible: false)
     end
   end
 end