1 files changed, 108 insertions, 101 deletions
diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb
index 65f4d09cfce..5d9403c23ac 100644
--- a/spec/controllers/projects/issues_controller_spec.rb
+++ b/spec/controllers/projects/issues_controller_spec.rb
@@ -233,144 +233,119 @@ describe Projects::IssuesController do
       end
     end
 
-    context 'when moving issue to another private project' do
-      let(:another_project) { create(:project, :private) }
-
-      context 'when user has access to move issue' do
-        before do
-          another_project.team << [user, :reporter]
-        end
-
-        it 'moves issue to another project' do
-          move_issue
+    context 'Akismet is enabled' do
+      let(:project) { create(:project_empty_repo, :public) }
 
-          expect(response).to have_http_status :found
-          expect(another_project.issues).not_to be_empty
-        end
+      before do
+        stub_application_setting(recaptcha_enabled: true)
+        allow_any_instance_of(SpamService).to receive(:check_for_spam?).and_return(true)
       end
 
-      context 'when user does not have access to move issue' do
-        it 'responds with 404' do
-          move_issue
+      context 'when an issue is not identified as spam' do
+        before do
+          allow_any_instance_of(described_class).to receive(:verify_recaptcha).and_return(false)
+          allow_any_instance_of(AkismetService).to receive(:spam?).and_return(false)
+        end
 
-          expect(response).to have_http_status :not_found
+        it 'normally updates the issue' do
+          expect { update_issue(title: 'Foo') }.to change { issue.reload.title }.to('Foo')
         end
       end
 
-      context 'Akismet is enabled' do
-        let(:project) { create(:project_empty_repo, :public) }
-
+      context 'when an issue is identified as spam' do
         before do
-          stub_application_setting(recaptcha_enabled: true)
-          allow_any_instance_of(SpamService).to receive(:check_for_spam?).and_return(true)
+          allow_any_instance_of(AkismetService).to receive(:spam?).and_return(true)
         end
 
-        context 'when an issue is not identified as spam' do
-          before do
-            allow_any_instance_of(described_class).to receive(:verify_recaptcha).and_return(false)
-            allow_any_instance_of(AkismetService).to receive(:spam?).and_return(false)
+        context 'when captcha is not verified' do
+          def update_spam_issue
+            update_issue(title: 'Spam Title', description: 'Spam lives here')
           end
 
-          it 'normally updates the issue' do
-            expect { update_issue(title: 'Foo') }.to change { issue.reload.title }.to('Foo')
+          before do
+            allow_any_instance_of(described_class).to receive(:verify_recaptcha).and_return(false)
           end
-        end
 
-        context 'when an issue is identified as spam' do
-          before do
-            allow_any_instance_of(AkismetService).to receive(:spam?).and_return(true)
+          it 'rejects an issue recognized as a spam' do
+            expect(Gitlab::Recaptcha).to receive(:load_configurations!).and_return(true)
+            expect { update_spam_issue }.not_to change { issue.reload.title }
           end
 
-          context 'when captcha is not verified' do
-            def update_spam_issue
-              update_issue(title: 'Spam Title', description: 'Spam lives here')
-            end
+          it 'rejects an issue recognized as a spam when recaptcha disabled' do
+            stub_application_setting(recaptcha_enabled: false)
 
-            before do
-              allow_any_instance_of(described_class).to receive(:verify_recaptcha).and_return(false)
-            end
+            expect { update_spam_issue }.not_to change { issue.reload.title }
+          end
 
-            it 'rejects an issue recognized as a spam' do
-              expect(Gitlab::Recaptcha).to receive(:load_configurations!).and_return(true)
-              expect { update_spam_issue }.not_to change { issue.reload.title }
-            end
+          it 'creates a spam log' do
+            update_spam_issue
 
-            it 'rejects an issue recognized as a spam when recaptcha disabled' do
-              stub_application_setting(recaptcha_enabled: false)
+            spam_logs = SpamLog.all
 
-              expect { update_spam_issue }.not_to change { issue.reload.title }
-            end
+            expect(spam_logs.count).to eq(1)
+            expect(spam_logs.first.title).to eq('Spam Title')
+            expect(spam_logs.first.recaptcha_verified).to be_falsey
+          end
 
-            it 'creates a spam log' do
+          context 'as HTML' do
+            it 'renders verify template' do
               update_spam_issue
 
-              spam_logs = SpamLog.all
-
-              expect(spam_logs.count).to eq(1)
-              expect(spam_logs.first.title).to eq('Spam Title')
-              expect(spam_logs.first.recaptcha_verified).to be_falsey
+              expect(response).to render_template(:verify)
             end
+          end
 
-            context 'as HTML' do
-              it 'renders verify template' do
-                update_spam_issue
-
-                expect(response).to render_template(:verify)
-              end
+          context 'as JSON' do
+            before do
+              update_issue({ title: 'Spam Title', description: 'Spam lives here' }, format: :json)
             end
 
-            context 'as JSON' do
-              before do
-                update_issue({ title: 'Spam Title', description: 'Spam lives here' }, format: :json)
-              end
-
-              it 'renders json errors' do
-                expect(json_response)
-                  .to eql("errors" => ["Your issue has been recognized as spam. Please, change the content or solve the reCAPTCHA to proceed."])
-              end
+            it 'renders json errors' do
+              expect(json_response)
+                .to eql("errors" => ["Your issue has been recognized as spam. Please, change the content or solve the reCAPTCHA to proceed."])
+            end
 
-              it 'returns 422 status' do
-                expect(response).to have_http_status(422)
-              end
+            it 'returns 422 status' do
+              expect(response).to have_http_status(422)
             end
           end
+        end
 
-          context 'when captcha is verified' do
-            let(:spammy_title) { 'Whatever' }
-            let!(:spam_logs) { create_list(:spam_log, 2, user: user, title: spammy_title) }
+        context 'when captcha is verified' do
+          let(:spammy_title) { 'Whatever' }
+          let!(:spam_logs) { create_list(:spam_log, 2, user: user, title: spammy_title) }
 
-            def update_verified_issue
-              update_issue({ title: spammy_title },
-                           { spam_log_id: spam_logs.last.id,
-                             recaptcha_verification: true })
-            end
+          def update_verified_issue
+            update_issue({ title: spammy_title },
+                         { spam_log_id: spam_logs.last.id,
+                           recaptcha_verification: true })
+          end
 
-            before do
-              allow_any_instance_of(described_class).to receive(:verify_recaptcha)
-                .and_return(true)
-            end
+          before do
+            allow_any_instance_of(described_class).to receive(:verify_recaptcha)
+              .and_return(true)
+          end
 
-            it 'redirect to issue page' do
-              update_verified_issue
+          it 'redirect to issue page' do
+            update_verified_issue
 
-              expect(response)
-                .to redirect_to(project_issue_path(project, issue))
-            end
+            expect(response)
+              .to redirect_to(project_issue_path(project, issue))
+          end
 
-            it 'accepts an issue after recaptcha is verified' do
-              expect { update_verified_issue }.to change { issue.reload.title }.to(spammy_title)
-            end
+          it 'accepts an issue after recaptcha is verified' do
+            expect { update_verified_issue }.to change { issue.reload.title }.to(spammy_title)
+          end
 
-            it 'marks spam log as recaptcha_verified' do
-              expect { update_verified_issue }.to change { SpamLog.last.recaptcha_verified }.from(false).to(true)
-            end
+          it 'marks spam log as recaptcha_verified' do
+            expect { update_verified_issue }.to change { SpamLog.last.recaptcha_verified }.from(false).to(true)
+          end
 
-            it 'does not mark spam log as recaptcha_verified when it does not belong to current_user' do
-              spam_log = create(:spam_log)
+          it 'does not mark spam log as recaptcha_verified when it does not belong to current_user' do
+            spam_log = create(:spam_log)
 
-              expect { update_issue(spam_log_id: spam_log.id, recaptcha_verification: true) }
-                .not_to change { SpamLog.last.recaptcha_verified }
-            end
+            expect { update_issue(spam_log_id: spam_log.id, recaptcha_verification: true) }
+              .not_to change { SpamLog.last.recaptcha_verified }
           end
         end
       end
@@ -385,13 +360,45 @@ describe Projects::IssuesController do
 
         put :update, params
       end
+    end
+  end
+
+  describe 'POST #move' do
+    before do
+      sign_in(user)
+      project.add_developer(user)
+    end
+
+    context 'when moving issue to another private project' do
+      let(:another_project) { create(:project, :private) }
+
+      context 'when user has access to move issue' do
+        before do
+          another_project.add_reporter(user)
+        end
+
+        it 'moves issue to another project' do
+          move_issue
+
+          expect(response).to have_http_status :ok
+          expect(another_project.issues).not_to be_empty
+        end
+      end
+
+      context 'when user does not have access to move issue' do
+        it 'responds with 404' do
+          move_issue
+
+          expect(response).to have_http_status :not_found
+        end
+      end
 
       def move_issue
-        put :update,
+        post :move,
+          format: :json,
           namespace_id: project.namespace.to_param,
           project_id: project,
           id: issue.iid,
-          issue: { title: 'New title' },
           move_to_project_id: another_project.id
       end
     end