Add latest changes from gitlab-org/gitlab@master

1 files changed, 21 insertions, 11 deletions

diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb
index badac688229..c48be8efb1b 100644
--- a/spec/controllers/projects/issues_controller_spec.rb
+++ b/spec/controllers/projects/issues_controller_spec.rb
@@ -1607,22 +1607,32 @@ RSpec.describe Projects::IssuesController do
         project.add_developer(user)
       end
 
-      it "returns 302 for project members with developer role" do
-        import_csv
+      context 'when upload proceeds correctly' do
+        it "returns 302 for project members with developer role" do
+          import_csv
 
-        expect(flash[:notice]).to eq(_("Your issues are being imported. Once finished, you'll get a confirmation email."))
-        expect(response).to redirect_to(project_issues_path(project))
-      end
+          expect(flash[:notice]).to eq(_("Your issues are being imported. Once finished, you'll get a confirmation email."))
+          expect(response).to redirect_to(project_issues_path(project))
+        end
+
+        it 'enqueues an import job' do
+          expect(ImportIssuesCsvWorker).to receive(:perform_async).with(user.id, project.id, Integer)
 
-      it "shows error when upload fails" do
-        expect_next_instance_of(UploadService) do |upload_service|
-          expect(upload_service).to receive(:execute).and_return(nil)
+          import_csv
         end
+      end
 
-        import_csv
+      context 'when upload fails' do
+        it "shows error when upload fails" do
+          expect_next_instance_of(UploadService) do |upload_service|
+            expect(upload_service).to receive(:execute).and_return(nil)
+          end
 
-        expect(flash[:alert]).to include(_('File upload error.'))
-        expect(response).to redirect_to(project_issues_path(project))
+          import_csv
+
+          expect(flash[:alert]).to include(_('File upload error.'))
+          expect(response).to redirect_to(project_issues_path(project))
+        end
       end
     end