Reduce changesfix/sm/31771-do-not-allow-jobs-to-be-erased-new

2 files changed, 25 insertions, 30 deletions

diff --git a/spec/controllers/projects/jobs_controller_spec.rb b/spec/controllers/projects/jobs_controller_spec.rb
index e50962df553..7490f8fefce 100644
--- a/spec/controllers/projects/jobs_controller_spec.rb
+++ b/spec/controllers/projects/jobs_controller_spec.rb
@@ -371,6 +371,8 @@ describe Projects::JobsController do
   end
 
   describe 'POST erase' do
+    let(:role) { :master }
+
     before do
       project.team << [user, role]
       sign_in(user)
@@ -378,8 +380,6 @@ describe Projects::JobsController do
       post_erase
     end
 
-    let(:role) { :master }
-
     context 'when job is erasable' do
       let(:job) { create(:ci_build, :erasable, :trace, pipeline: pipeline) }
 
diff --git a/spec/requests/api/jobs_spec.rb b/spec/requests/api/jobs_spec.rb
index 327b1176088..2a83213e87a 100644
--- a/spec/requests/api/jobs_spec.rb
+++ b/spec/requests/api/jobs_spec.rb
@@ -500,47 +500,42 @@ describe API::Jobs do
   end
 
   describe 'POST /projects/:id/jobs/:job_id/erase' do
-    context 'when a master erases a build' do
-      before do
-        project.add_master(user)
-
-        post api("/projects/#{project.id}/jobs/#{job.id}/erase", user)
-      end
+    let(:role) { :master }
 
-      context 'job is erasable' do
-        let(:job) { create(:ci_build, :trace, :artifacts, :success, project: project, pipeline: pipeline) }
+    before do
+      project.team << [user, role]
 
-        it 'erases job content' do
-          expect(response).to have_gitlab_http_status(201)
-          expect(job).not_to have_trace
-          expect(job.artifacts_file.exists?).to be_falsy
-          expect(job.artifacts_metadata.exists?).to be_falsy
-        end
+      post api("/projects/#{project.id}/jobs/#{job.id}/erase", user)
+    end
 
-        it 'updates job' do
-          job.reload
+    context 'job is erasable' do
+      let(:job) { create(:ci_build, :trace, :artifacts, :success, project: project, pipeline: pipeline) }
 
-          expect(job.erased_at).to be_truthy
-          expect(job.erased_by).to eq(user)
-        end
+      it 'erases job content' do
+        expect(response).to have_gitlab_http_status(201)
+        expect(job).not_to have_trace
+        expect(job.artifacts_file.exists?).to be_falsy
+        expect(job.artifacts_metadata.exists?).to be_falsy
       end
 
-      context 'job is not erasable' do
-        let(:job) { create(:ci_build, :trace, project: project, pipeline: pipeline) }
+      it 'updates job' do
+        job.reload
 
-        it 'responds with forbidden' do
-          expect(response).to have_gitlab_http_status(403)
-        end
+        expect(job.erased_at).to be_truthy
+        expect(job.erased_by).to eq(user)
       end
     end
 
-    context 'when a developer erases a build' do
-      before do
-        project.add_developer(user)
+    context 'job is not erasable' do
+      let(:job) { create(:ci_build, :trace, project: project, pipeline: pipeline) }
 
-        post api("/projects/#{project.id}/jobs/#{job.id}/erase", user)
+      it 'responds with forbidden' do
+        expect(response).to have_gitlab_http_status(403)
       end
+    end
 
+    context 'when a developer erases a build' do
+      let(:role) { :developer }
       let(:job) { create(:ci_build, :trace, :artifacts, :success, project: project, pipeline: pipeline, user: owner) }
 
       context 'when the build was created by the developer' do