Removed update methodissuable-todo-improvements

Re-structured controller spec
Renamed issuable param to issuable_id

1 files changed, 80 insertions, 86 deletions

diff --git a/spec/controllers/projects/todo_controller_spec.rb b/spec/controllers/projects/todo_controller_spec.rb
index 2160f0b802c..40a3403b660 100644
--- a/spec/controllers/projects/todo_controller_spec.rb
+++ b/spec/controllers/projects/todo_controller_spec.rb
@@ -7,101 +7,95 @@ describe Projects::TodosController do
   let(:merge_request) { create(:merge_request, source_project: project) }
 
   context 'Issues' do
-    describe 'POST #create' do
-      before do
-        sign_in(user)
-        project.team << [user, :developer]
+    describe 'POST create' do
+      context 'when authorized' do
+        before do
+          sign_in(user)
+          project.team << [user, :developer]
+        end
+
+        it 'should create todo for issue' do
+          expect do
+            post(:create, namespace_id: project.namespace.path,
+                          project_id: project.path,
+                          issuable_id: issue.id,
+                          issuable_type: 'issue')
+          end.to change { user.todos.count }.by(1)
+
+          expect(response.status).to eq(200)
+        end
       end
 
-      it 'should create todo for issue' do
-        expect do
-          post(:create, namespace_id: project.namespace.path,
-                        project_id: project.path,
-                        issuable_id: issue.id,
-                        issuable_type: "issue")
-        end.to change { user.todos.count }.by(1)
-
-        expect(response.status).to eq(200)
-      end
-    end
-
-    describe 'POST #create when not authorized' do
-      before do
-        sign_in(user)
-      end
-
-      it 'should create todo for issue' do
-        expect do
-          post(:create, namespace_id: project.namespace.path,
-                        project_id: project.path,
-                        issuable_id: issue.id,
-                        issuable_type: "issue")
-        end.to change { user.todos.count }.by(0)
-
-        expect(response.status).to eq(404)
-      end
-    end
-
-    describe 'POST #create when not logged in' do
-      it 'should create todo for issue' do
-        expect do
-          post(:create, namespace_id: project.namespace.path,
-                        project_id: project.path,
-                        issuable_id: issue.id,
-                        issuable_type: "issue")
-        end.to change { user.todos.count }.by(0)
-
-        expect(response.status).to eq(302)
+      context 'when not authorized' do
+        it 'should not create todo for issue that user has no access to' do
+          sign_in(user)
+          expect do
+            post(:create, namespace_id: project.namespace.path,
+                          project_id: project.path,
+                          issuable_id: issue.id,
+                          issuable_type: 'issue')
+          end.to change { user.todos.count }.by(0)
+
+          expect(response.status).to eq(404)
+        end
+
+        it 'should not create todo for issue when user not logged in' do
+          expect do
+            post(:create, namespace_id: project.namespace.path,
+                          project_id: project.path,
+                          issuable_id: issue.id,
+                          issuable_type: 'issue')
+          end.to change { user.todos.count }.by(0)
+
+          expect(response.status).to eq(302)
+        end
       end
     end
   end
 
   context 'Merge Requests' do
-    describe 'POST #create' do
-      before do
-        sign_in(user)
-        project.team << [user, :developer]
+    describe 'POST create' do
+      context 'when authorized' do
+        before do
+          sign_in(user)
+          project.team << [user, :developer]
+        end
+
+        it 'should create todo for merge request' do
+          expect do
+            post(:create, namespace_id: project.namespace.path,
+                          project_id: project.path,
+                          issuable_id: merge_request.id,
+                          issuable_type: 'merge_request')
+          end.to change { user.todos.count }.by(1)
+
+          expect(response.status).to eq(200)
+        end
       end
 
-      it 'should create todo for issue' do
-        expect do
-          post(:create, namespace_id: project.namespace.path,
-                        project_id: project.path,
-                        issuable_id: merge_request.id,
-                        issuable_type: "merge_request")
-        end.to change { user.todos.count }.by(1)
-
-        expect(response.status).to eq(200)
-      end
-    end
-
-    describe 'POST #create when not authorized' do
-      before do
-        sign_in(user)
-      end
-
-      it 'should create todo for issue' do
-        expect do
-          post(:create, namespace_id: project.namespace.path,
-                        project_id: project.path,
-                        issuable_id: merge_request.id,
-                        issuable_type: "merge_request")
-        end.to change { user.todos.count }.by(0)
-
-        expect(response.status).to eq(404)
-      end
-    end
-
-    describe 'POST #create when not logged in' do
-      it 'should create todo for issue' do
-        expect do
-          post(:create, namespace_id: project.namespace.path,
-                        project_id: project.path,
-                        issuable_id: merge_request.id,
-                        issuable_type: "merge_request")
-        end.to change { user.todos.count }.by(0)
-
-        expect(response.status).to eq(302)
+      context 'when not authorized' do
+        it 'should not create todo for merge request user has no access to' do
+          sign_in(user)
+          expect do
+            post(:create, namespace_id: project.namespace.path,
+                          project_id: project.path,
+                          issuable_id: merge_request.id,
+                          issuable_type: 'merge_request')
+          end.to change { user.todos.count }.by(0)
+
+          expect(response.status).to eq(404)
+        end
+
+        it 'should not create todo for merge request user has no access to' do
+          expect do
+            post(:create, namespace_id: project.namespace.path,
+                          project_id: project.path,
+                          issuable_id: merge_request.id,
+                          issuable_type: 'merge_request')
+          end.to change { user.todos.count }.by(0)
+
+          expect(response.status).to eq(302)
+        end
       end
     end
   end