Add latest changes from gitlab-org/gitlab@master

1 files changed, 1 insertions, 4 deletions

diff --git a/spec/controllers/projects/import/jira_controller_spec.rb b/spec/controllers/projects/import/jira_controller_spec.rb
index 9d68104b755..3a29c3d4093 100644
--- a/spec/controllers/projects/import/jira_controller_spec.rb
+++ b/spec/controllers/projects/import/jira_controller_spec.rb
@@ -118,10 +118,9 @@ describe Projects::Import::JiraController do
             end
 
             it 'uses the existing import data' do
-              expect(controller).not_to receive(:schedule_import)
-
               post :import, params: { namespace_id: project.namespace, project_id: project, jira_project_key: 'New Project' }
 
+              expect(flash[:notice]).to eq('Jira import is already running.')
               expect(response).to redirect_to(project_import_jira_path(project))
             end
           end
@@ -153,8 +152,6 @@ describe Projects::Import::JiraController do
             end
 
             it 'uses the existing import data' do
-              expect(controller).to receive(:schedule_import).and_call_original
-
               post :import, params: { namespace_id: project.namespace, project_id: project, jira_project_key: 'New Project' }
 
               project.reload