Fix Style/Blocks cop violations

6 files changed, 42 insertions, 47 deletions

diff --git a/spec/requests/api/files_spec.rb b/spec/requests/api/files_spec.rb
index 15f547e128d..27a26b56fef 100644
--- a/spec/requests/api/files_spec.rb
+++ b/spec/requests/api/files_spec.rb
@@ -39,14 +39,14 @@ describe API::API, api: true  do
   end
 
   describe "POST /projects/:id/repository/files" do
-    let(:valid_params) {
+    let(:valid_params) do
       {
         file_path: 'newfile.rb',
         branch_name: 'master',
         content: 'puts 8',
         commit_message: 'Added newfile'
       }
-    }
+    end
 
     it "should create a new file in project repo" do
       post api("/projects/#{project.id}/repository/files", user), valid_params
@@ -70,14 +70,14 @@ describe API::API, api: true  do
   end
 
   describe "PUT /projects/:id/repository/files" do
-    let(:valid_params) {
+    let(:valid_params) do
       {
         file_path: file_path,
         branch_name: 'master',
         content: 'puts 8',
         commit_message: 'Changed file'
       }
-    }
+    end
 
     it "should update existing file in project repo" do
       put api("/projects/#{project.id}/repository/files", user), valid_params
@@ -92,13 +92,13 @@ describe API::API, api: true  do
   end
 
   describe "DELETE /projects/:id/repository/files" do
-    let(:valid_params) {
+    let(:valid_params) do
       {
         file_path: file_path,
         branch_name: 'master',
         commit_message: 'Changed file'
       }
-    }
+    end
 
     it "should delete existing file in project repo" do
       delete api("/projects/#{project.id}/repository/files", user), valid_params
diff --git a/spec/requests/api/fork_spec.rb b/spec/requests/api/fork_spec.rb
index 7a784796031..3fe7efff5ba 100644
--- a/spec/requests/api/fork_spec.rb
+++ b/spec/requests/api/fork_spec.rb
@@ -6,15 +6,14 @@ describe API::API, api: true  do
   let(:user2) { create(:user) }
   let(:user3) { create(:user) }
   let(:admin) { create(:admin) }
-  let(:project)       {
-    create(:project,        creator_id:   user.id,
-                            namespace:    user.namespace)
-  }
-  let(:project_user2) {
-    create(:project_member, user:         user2,
-                            project:      project,
-                            access_level: ProjectMember::GUEST)
-  }
+
+  let(:project) do
+    create(:project, creator_id: user.id, namespace: user.namespace)
+  end
+
+  let(:project_user2) do
+    create(:project_member, user: user2, project: project, access_level: ProjectMember::GUEST)
+  end
 
   describe 'POST /projects/fork/:id' do
     before { project_user2 }
diff --git a/spec/requests/api/group_members_spec.rb b/spec/requests/api/group_members_spec.rb
index 8ba6876a95b..dd5baa44cb2 100644
--- a/spec/requests/api/group_members_spec.rb
+++ b/spec/requests/api/group_members_spec.rb
@@ -61,10 +61,9 @@ describe API::API, api: true  do
       it "should return ok and add new member" do
         new_user = create(:user)
 
-        expect {
-          post api("/groups/#{group_no_members.id}/members", owner),
-          user_id: new_user.id, access_level: GroupMember::MASTER
-        }.to change { group_no_members.members.count }.by(1)
+        expect do
+          post api("/groups/#{group_no_members.id}/members", owner), user_id: new_user.id, access_level: GroupMember::MASTER
+        end.to change { group_no_members.members.count }.by(1)
 
         expect(response.status).to eq(201)
         expect(json_response['name']).to eq(new_user.name)
@@ -74,10 +73,9 @@ describe API::API, api: true  do
       it "should not allow guest to modify group members" do
         new_user = create(:user)
 
-        expect {
-          post api("/groups/#{group_with_members.id}/members", guest),
-          user_id: new_user.id, access_level: GroupMember::MASTER
-        }.not_to change { group_with_members.members.count }
+        expect do
+          post api("/groups/#{group_with_members.id}/members", guest), user_id: new_user.id, access_level: GroupMember::MASTER
+        end.not_to change { group_with_members.members.count }
 
         expect(response.status).to eq(403)
       end
@@ -178,9 +176,9 @@ describe API::API, api: true  do
 
     context "when a member of the group" do
       it "should delete guest's membership of group" do
-        expect {
+        expect do
           delete api("/groups/#{group_with_members.id}/members/#{guest.id}", owner)
-        }.to change { group_with_members.members.count }.by(-1)
+        end.to change { group_with_members.members.count }.by(-1)
 
         expect(response.status).to eq(200)
       end
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 38c67bc9971..cb7da3aa3c4 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -8,9 +8,10 @@ describe API::API, api: true  do
   let!(:merge_request_closed) { create(:merge_request, state: "closed", author: user, assignee: user, source_project: project, target_project: project, title: "Closed test") }
   let!(:merge_request_merged) { create(:merge_request, state: "merged", author: user, assignee: user, source_project: project, target_project: project, title: "Merged test") }
   let!(:note) { create(:note_on_merge_request, author: user, project: project, noteable: merge_request, note: "a comment on a MR") }
-  before {
+
+  before do
     project.team << [user, :reporters]
-  }
+  end
 
   describe "GET /projects/:id/merge_requests" do
     context "when unauthenticated" do
diff --git a/spec/requests/api/project_hooks_spec.rb b/spec/requests/api/project_hooks_spec.rb
index 81fe68de662..5037575d355 100644
--- a/spec/requests/api/project_hooks_spec.rb
+++ b/spec/requests/api/project_hooks_spec.rb
@@ -61,10 +61,9 @@ describe API::API, 'ProjectHooks', api: true  do
 
   describe "POST /projects/:id/hooks" do
     it "should add hook to project" do
-      expect {
-        post api("/projects/#{project.id}/hooks", user),
-          url: "http://example.com", issues_events: true
-      }.to change {project.hooks.count}.by(1)
+      expect do
+        post api("/projects/#{project.id}/hooks", user), url: "http://example.com", issues_events: true
+      end.to change {project.hooks.count}.by(1)
       expect(response.status).to eq(201)
     end
 
@@ -105,9 +104,9 @@ describe API::API, 'ProjectHooks', api: true  do
 
   describe "DELETE /projects/:id/hooks/:hook_id" do
     it "should delete hook from project" do
-      expect {
+      expect do
         delete api("/projects/#{project.id}/hooks/#{hook.id}", user)
-      }.to change {project.hooks.count}.by(-1)
+      end.to change {project.hooks.count}.by(-1)
       expect(response.status).to eq(200)
     end
 
diff --git a/spec/requests/api/project_members_spec.rb b/spec/requests/api/project_members_spec.rb
index 8419a364ed1..d2c1dd6264b 100644
--- a/spec/requests/api/project_members_spec.rb
+++ b/spec/requests/api/project_members_spec.rb
@@ -53,10 +53,9 @@ describe API::API, api: true  do
 
   describe "POST /projects/:id/members" do
     it "should add user to project team" do
-      expect {
-        post api("/projects/#{project.id}/members", user), user_id: user2.id,
-          access_level: ProjectMember::DEVELOPER
-      }.to change { ProjectMember.count }.by(1)
+      expect do
+        post api("/projects/#{project.id}/members", user), user_id: user2.id, access_level: ProjectMember::DEVELOPER
+      end.to change { ProjectMember.count }.by(1)
 
       expect(response.status).to eq(201)
       expect(json_response['username']).to eq(user2.username)
@@ -66,10 +65,9 @@ describe API::API, api: true  do
     it "should return a 201 status if user is already project member" do
       post api("/projects/#{project.id}/members", user), user_id: user2.id,
         access_level: ProjectMember::DEVELOPER
-      expect {
-        post api("/projects/#{project.id}/members", user), user_id: user2.id,
-          access_level: ProjectMember::DEVELOPER
-      }.not_to change { ProjectMember.count }
+      expect do
+        post api("/projects/#{project.id}/members", user), user_id: user2.id, access_level: ProjectMember::DEVELOPER
+      end.not_to change { ProjectMember.count }
 
       expect(response.status).to eq(201)
       expect(json_response['username']).to eq(user2.username)
@@ -123,16 +121,16 @@ describe API::API, api: true  do
     before { project_member2 }
 
     it "should remove user from project team" do
-      expect {
+      expect do
         delete api("/projects/#{project.id}/members/#{user3.id}", user)
-      }.to change { ProjectMember.count }.by(-1)
+      end.to change { ProjectMember.count }.by(-1)
     end
 
     it "should return 200 if team member is not part of a project" do
       delete api("/projects/#{project.id}/members/#{user3.id}", user)
-      expect {
+      expect do
         delete api("/projects/#{project.id}/members/#{user3.id}", user)
-      }.to_not change { ProjectMember.count }
+      end.to_not change { ProjectMember.count }
     end
 
     it "should return 200 if team member already removed" do
@@ -142,9 +140,9 @@ describe API::API, api: true  do
     end
 
     it "should return 200 OK when the user was not member" do
-      expect {
+      expect do
         delete api("/projects/#{project.id}/members/1000000", user)
-      }.to change { ProjectMember.count }.by(0)
+      end.to change { ProjectMember.count }.by(0)
       expect(response.status).to eq(200)
       expect(json_response['message']).to eq("Access revoked")
       expect(json_response['id']).to eq(1000000)