From 71777a4a184945d6b58170af55d9fd9fef821ac9 Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Tue, 16 May 2017 19:41:15 +0800
Subject: Rename BuildsController to JobsController

Rename other URL generators

admin_builds_path -> admin_jobs_path

Fix tests and more renaming

Fix more tests

Also change build_id to job_id in the controller
---
 spec/serializers/build_action_entity_spec.rb   | 12 ++++++------
 spec/serializers/build_artifact_entity_spec.rb | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'spec/serializers')

diff --git a/spec/serializers/build_action_entity_spec.rb b/spec/serializers/build_action_entity_spec.rb
index 059deba5416..15720d86583 100644
--- a/spec/serializers/build_action_entity_spec.rb
+++ b/spec/serializers/build_action_entity_spec.rb
@@ -1,26 +1,26 @@
 require 'spec_helper'
 
 describe BuildActionEntity do
-  let(:build) { create(:ci_build, name: 'test_build') }
+  let(:job) { create(:ci_build, name: 'test_job') }
   let(:request) { double('request') }
 
   let(:entity) do
-    described_class.new(build, request: spy('request'))
+    described_class.new(job, request: spy('request'))
   end
 
   describe '#as_json' do
     subject { entity.as_json }
 
-    it 'contains original build name' do
-      expect(subject[:name]).to eq 'test_build'
+    it 'contains original job name' do
+      expect(subject[:name]).to eq 'test_job'
     end
 
     it 'contains path to the action play' do
-      expect(subject[:path]).to include "builds/#{build.id}/play"
+      expect(subject[:path]).to include "jobs/#{job.id}/play"
     end
 
     it 'contains whether it is playable' do
-      expect(subject[:playable]).to eq build.playable?
+      expect(subject[:playable]).to eq job.playable?
     end
   end
 end
diff --git a/spec/serializers/build_artifact_entity_spec.rb b/spec/serializers/build_artifact_entity_spec.rb
index 2fc60aa9de6..b4eef20d6a6 100644
--- a/spec/serializers/build_artifact_entity_spec.rb
+++ b/spec/serializers/build_artifact_entity_spec.rb
@@ -1,22 +1,22 @@
 require 'spec_helper'
 
 describe BuildArtifactEntity do
-  let(:build) { create(:ci_build, name: 'test:build') }
+  let(:job) { create(:ci_build, name: 'test:job') }
 
   let(:entity) do
-    described_class.new(build, request: double)
+    described_class.new(job, request: double)
   end
 
   describe '#as_json' do
     subject { entity.as_json }
 
-    it 'contains build name' do
-      expect(subject[:name]).to eq 'test:build'
+    it 'contains job name' do
+      expect(subject[:name]).to eq 'test:job'
     end
 
     it 'contains path to the artifacts' do
       expect(subject[:path])
-        .to include "builds/#{build.id}/artifacts/download"
+        .to include "jobs/#{job.id}/artifacts/download"
     end
   end
 end
-- 
cgit v1.2.3


From 0f52544baddd570646f8ae4c1d00eed1cdb6b59d Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 31 May 2017 10:37:19 +0200
Subject: Fix build entity specs related to protected actions

---
 spec/serializers/build_entity_spec.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'spec/serializers')

diff --git a/spec/serializers/build_entity_spec.rb b/spec/serializers/build_entity_spec.rb
index b5eb84ae43b..6d5e1046e86 100644
--- a/spec/serializers/build_entity_spec.rb
+++ b/spec/serializers/build_entity_spec.rb
@@ -3,6 +3,7 @@ require 'spec_helper'
 describe BuildEntity do
   let(:user) { create(:user) }
   let(:build) { create(:ci_build) }
+  let(:project) { build.project }
   let(:request) { double('request') }
 
   before do
@@ -52,7 +53,10 @@ describe BuildEntity do
 
     context 'when user is allowed to trigger action' do
       before do
-        build.project.add_master(user)
+        project.add_developer(user)
+
+        create(:protected_branch, :developers_can_merge,
+               name: 'master', project: project)
       end
 
       it 'contains path to play action' do
-- 
cgit v1.2.3