From 805715cc68aabb6992a63356ec7c19940f52c93a Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 30 May 2017 15:30:45 +0200
Subject: Add stage seed class that represents attributes

---
 spec/lib/gitlab/ci/stage/seed_spec.rb | 47 +++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 spec/lib/gitlab/ci/stage/seed_spec.rb

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/ci/stage/seed_spec.rb b/spec/lib/gitlab/ci/stage/seed_spec.rb
new file mode 100644
index 00000000000..a12093b2c7c
--- /dev/null
+++ b/spec/lib/gitlab/ci/stage/seed_spec.rb
@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe Gitlab::Ci::Stage::Seed do
+  subject do
+    described_class.new(name: 'test', builds: builds)
+  end
+
+  let(:builds) do
+    [{ name: 'rspec' }, { name: 'spinach' }]
+  end
+
+  describe '#pipeline=' do
+    let(:pipeline) do
+      create(:ci_empty_pipeline, ref: 'feature', tag: true)
+    end
+
+    it 'assignes relevant pipeline attributes' do
+      trigger_request = pipeline.trigger_requests.first
+
+      subject.pipeline = pipeline
+
+      expect(subject.builds).to all(include(pipeline: pipeline))
+      expect(subject.builds).to all(include(project: pipeline.project))
+      expect(subject.builds).to all(include(ref: 'feature'))
+      expect(subject.builds).to all(include(tag: true))
+      expect(subject.builds).to all(include(trigger_request: trigger_request))
+    end
+  end
+
+  describe '#user=' do
+    let(:user) { create(:user) }
+
+    it 'assignes relevant pipeline attributes' do
+      subject.user = user
+
+      expect(subject.builds).to all(include(user: user))
+    end
+  end
+
+  describe '#to_attributes' do
+    it 'exposes stage attributes with nested jobs' do
+      expect(subject.to_attributes).to be_a Hash
+      expect(subject.to_attributes).to include(name: 'test')
+      expect(subject.to_attributes).to include(builds_attributes: builds)
+    end
+  end
+end
-- 
cgit v1.2.3


From 4464c22d6d23d893494682d309aec3fb31c11ae3 Mon Sep 17 00:00:00 2001
From: Jarka Kadlecova <jarka@gitlab.com>
Date: Wed, 3 May 2017 17:26:49 +0200
Subject: Support descriptions for snippets

---
 spec/lib/gitlab/import_export/safe_model_attributes.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml
index 96054c996fd..1dd0c748c7b 100644
--- a/spec/lib/gitlab/import_export/safe_model_attributes.yml
+++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml
@@ -92,6 +92,7 @@ Milestone:
 ProjectSnippet:
 - id
 - title
+- description
 - content
 - author_id
 - project_id
-- 
cgit v1.2.3


From c881425b665b9c0b022dc2e213486aecc320ec7e Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 31 May 2017 14:40:50 +0200
Subject: Refine pipeline stages seeds class

---
 spec/lib/gitlab/ci/stage/seed_spec.rb  | 47 --------------------------
 spec/lib/gitlab/ci/stage/seeds_spec.rb | 62 ++++++++++++++++++++++++++++++++++
 2 files changed, 62 insertions(+), 47 deletions(-)
 delete mode 100644 spec/lib/gitlab/ci/stage/seed_spec.rb
 create mode 100644 spec/lib/gitlab/ci/stage/seeds_spec.rb

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/ci/stage/seed_spec.rb b/spec/lib/gitlab/ci/stage/seed_spec.rb
deleted file mode 100644
index a12093b2c7c..00000000000
--- a/spec/lib/gitlab/ci/stage/seed_spec.rb
+++ /dev/null
@@ -1,47 +0,0 @@
-require 'spec_helper'
-
-describe Gitlab::Ci::Stage::Seed do
-  subject do
-    described_class.new(name: 'test', builds: builds)
-  end
-
-  let(:builds) do
-    [{ name: 'rspec' }, { name: 'spinach' }]
-  end
-
-  describe '#pipeline=' do
-    let(:pipeline) do
-      create(:ci_empty_pipeline, ref: 'feature', tag: true)
-    end
-
-    it 'assignes relevant pipeline attributes' do
-      trigger_request = pipeline.trigger_requests.first
-
-      subject.pipeline = pipeline
-
-      expect(subject.builds).to all(include(pipeline: pipeline))
-      expect(subject.builds).to all(include(project: pipeline.project))
-      expect(subject.builds).to all(include(ref: 'feature'))
-      expect(subject.builds).to all(include(tag: true))
-      expect(subject.builds).to all(include(trigger_request: trigger_request))
-    end
-  end
-
-  describe '#user=' do
-    let(:user) { create(:user) }
-
-    it 'assignes relevant pipeline attributes' do
-      subject.user = user
-
-      expect(subject.builds).to all(include(user: user))
-    end
-  end
-
-  describe '#to_attributes' do
-    it 'exposes stage attributes with nested jobs' do
-      expect(subject.to_attributes).to be_a Hash
-      expect(subject.to_attributes).to include(name: 'test')
-      expect(subject.to_attributes).to include(builds_attributes: builds)
-    end
-  end
-end
diff --git a/spec/lib/gitlab/ci/stage/seeds_spec.rb b/spec/lib/gitlab/ci/stage/seeds_spec.rb
new file mode 100644
index 00000000000..cc4f37d236e
--- /dev/null
+++ b/spec/lib/gitlab/ci/stage/seeds_spec.rb
@@ -0,0 +1,62 @@
+require 'spec_helper'
+
+describe Gitlab::Ci::Stage::Seeds do
+  before do
+    subject.append_stage('test', [{ name: 'rspec' }, { name: 'spinach' }])
+    subject.append_stage('deploy', [{ name: 'prod', script: 'cap deploy' }])
+  end
+
+  describe '#stages' do
+    it 'returns hashes of all stages' do
+      expect(subject.stages.size).to eq 2
+      expect(subject.stages).to all(be_a Hash)
+    end
+  end
+
+  describe '#jobs' do
+    it 'returns all jobs in all stages' do
+      expect(subject.jobs.size).to eq 3
+    end
+  end
+
+  describe '#pipeline=' do
+    let(:pipeline) do
+      create(:ci_empty_pipeline, ref: 'feature', tag: true)
+    end
+
+    it 'assignes relevant pipeline attributes' do
+      trigger_request = pipeline.trigger_requests.first
+
+      subject.pipeline = pipeline
+
+      expect(subject.stages).to all(include(pipeline: pipeline))
+      expect(subject.stages).to all(include(project: pipeline.project))
+      expect(subject.jobs).to all(include(pipeline: pipeline))
+      expect(subject.jobs).to all(include(project: pipeline.project))
+      expect(subject.jobs).to all(include(ref: 'feature'))
+      expect(subject.jobs).to all(include(tag: true))
+      expect(subject.jobs).to all(include(trigger_request: trigger_request))
+    end
+  end
+
+  describe '#user=' do
+    let(:user) { create(:user) }
+
+    it 'assignes relevant pipeline attributes' do
+      subject.user = user
+
+      expect(subject.jobs).to all(include(user: user))
+    end
+  end
+
+  describe '#to_attributes' do
+    it 'exposes stage attributes with nested jobs' do
+      attributes = [{ name: 'test', builds_attributes:
+                      [{ name: 'rspec' }, { name: 'spinach' }] },
+                    { name: 'deploy', builds_attributes:
+                      [{ name: 'prod', script: 'cap deploy' }] }]
+
+      expect(subject.to_attributes).to eq attributes
+    end
+  end
+end
-- 
cgit v1.2.3


From c72e21fd9764845a107005562ff8ce1c06cac431 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 31 May 2017 15:13:40 +0200
Subject: Return stage seeds object from YAML processor

---
 spec/lib/gitlab/ci/stage/seeds_spec.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/ci/stage/seeds_spec.rb b/spec/lib/gitlab/ci/stage/seeds_spec.rb
index cc4f37d236e..3824a868fb2 100644
--- a/spec/lib/gitlab/ci/stage/seeds_spec.rb
+++ b/spec/lib/gitlab/ci/stage/seeds_spec.rb
@@ -6,6 +6,10 @@ describe Gitlab::Ci::Stage::Seeds do
     subject.append_stage('deploy', [{ name: 'prod', script: 'cap deploy' }])
   end
 
+  describe '#has_stages?' do
+    it { is_expected.to have_stages }
+  end
+
   describe '#stages' do
     it 'returns hashes of all stages' do
       expect(subject.stages.size).to eq 2
-- 
cgit v1.2.3


From 1a438e9f710edfa50408d93a363a240bdcd532c1 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 1 Jun 2017 12:21:34 +0200
Subject: Use stage_id column in code that needs to know about it

---
 spec/lib/gitlab/import_export/safe_model_attributes.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml
index 96054c996fd..2388aea24d9 100644
--- a/spec/lib/gitlab/import_export/safe_model_attributes.yml
+++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml
@@ -212,6 +212,7 @@ CommitStatus:
 - stage
 - trigger_request_id
 - stage_idx
+- stage_id
 - tag
 - ref
 - user_id
-- 
cgit v1.2.3


From fe0b2f81c7c9680a11288e0cdffc3e80dc1e8d58 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 2 Jun 2017 12:16:11 +0200
Subject: Refine implementation of pipeline stage seeds

---
 spec/lib/gitlab/ci/stage/seed_spec.rb  | 54 ++++++++++++++++++++++++++++
 spec/lib/gitlab/ci/stage/seeds_spec.rb | 66 ----------------------------------
 2 files changed, 54 insertions(+), 66 deletions(-)
 create mode 100644 spec/lib/gitlab/ci/stage/seed_spec.rb
 delete mode 100644 spec/lib/gitlab/ci/stage/seeds_spec.rb

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/ci/stage/seed_spec.rb b/spec/lib/gitlab/ci/stage/seed_spec.rb
new file mode 100644
index 00000000000..15bcce04447
--- /dev/null
+++ b/spec/lib/gitlab/ci/stage/seed_spec.rb
@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe Gitlab::Ci::Stage::Seed do
+  let(:pipeline) { create(:ci_empty_pipeline) }
+
+  let(:builds) do
+    [{ name: 'rspec' }, { name: 'spinach' }]
+  end
+
+  subject do
+    described_class.new(pipeline, 'test', builds)
+  end
+
+  describe '#stage' do
+    it 'returns hash attributes of a stage' do
+      expect(subject.stage).to be_a Hash
+      expect(subject.stage).to include(:name, :project)
+    end
+  end
+
+  describe '#builds' do
+    it 'returns hash attributes of all builds' do
+      expect(subject.builds.size).to eq 2
+      expect(subject.builds).to all(include(pipeline: pipeline))
+      expect(subject.builds).to all(include(project: pipeline.project))
+      expect(subject.builds).to all(include(ref: 'master'))
+      expect(subject.builds).to all(include(tag: false))
+      expect(subject.builds)
+        .to all(include(trigger_request: pipeline.trigger_requests.first))
+    end
+  end
+
+  describe '#user=' do
+    let(:user) { create(:user) }
+
+    it 'assignes relevant pipeline attributes' do
+      subject.user = user
+
+      expect(subject.builds).to all(include(user: user))
+    end
+  end
+
+  describe '#create!' do
+    it 'creates all stages and builds' do
+      subject.create!
+
+      expect(pipeline.reload.stages.count).to eq 1
+      expect(pipeline.reload.builds.count).to eq 2
+      expect(pipeline.builds).to all(satisfy { |job| job.stage_id.present? })
+      expect(pipeline.builds).to all(satisfy { |job| job.pipeline.present? })
+      expect(pipeline.builds).to all(satisfy { |job| job.project.present? })
+    end
+  end
+end
diff --git a/spec/lib/gitlab/ci/stage/seeds_spec.rb b/spec/lib/gitlab/ci/stage/seeds_spec.rb
deleted file mode 100644
index 3824a868fb2..00000000000
--- a/spec/lib/gitlab/ci/stage/seeds_spec.rb
+++ /dev/null
@@ -1,66 +0,0 @@
-require 'spec_helper'
-
-describe Gitlab::Ci::Stage::Seeds do
-  before do
-    subject.append_stage('test', [{ name: 'rspec' }, { name: 'spinach' }])
-    subject.append_stage('deploy', [{ name: 'prod', script: 'cap deploy' }])
-  end
-
-  describe '#has_stages?' do
-    it { is_expected.to have_stages }
-  end
-
-  describe '#stages' do
-    it 'returns hashes of all stages' do
-      expect(subject.stages.size).to eq 2
-      expect(subject.stages).to all(be_a Hash)
-    end
-  end
-
-  describe '#jobs' do
-    it 'returns all jobs in all stages' do
-      expect(subject.jobs.size).to eq 3
-    end
-  end
-
-  describe '#pipeline=' do
-    let(:pipeline) do
-      create(:ci_empty_pipeline, ref: 'feature', tag: true)
-    end
-
-    it 'assignes relevant pipeline attributes' do
-      trigger_request = pipeline.trigger_requests.first
-
-      subject.pipeline = pipeline
-
-      expect(subject.stages).to all(include(pipeline: pipeline))
-      expect(subject.stages).to all(include(project: pipeline.project))
-      expect(subject.jobs).to all(include(pipeline: pipeline))
-      expect(subject.jobs).to all(include(project: pipeline.project))
-      expect(subject.jobs).to all(include(ref: 'feature'))
-      expect(subject.jobs).to all(include(tag: true))
-      expect(subject.jobs).to all(include(trigger_request: trigger_request))
-    end
-  end
-
-  describe '#user=' do
-    let(:user) { create(:user) }
-
-    it 'assignes relevant pipeline attributes' do
-      subject.user = user
-
-      expect(subject.jobs).to all(include(user: user))
-    end
-  end
-
-  describe '#to_attributes' do
-    it 'exposes stage attributes with nested jobs' do
-      attributes = [{ name: 'test', builds_attributes:
-                      [{ name: 'rspec' }, { name: 'spinach' }] },
-                    { name: 'deploy', builds_attributes:
-                      [{ name: 'prod', script: 'cap deploy' }] }]
-
-      expect(subject.to_attributes).to eq attributes
-    end
-  end
-end
-- 
cgit v1.2.3


From 626cb8edc3f4421fe7e866c51fddc2715875ddda Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 2 Jun 2017 15:05:14 +0200
Subject: Fix invalid conditional in pipeline create service

---
 spec/lib/gitlab/ci/stage/seed_spec.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/ci/stage/seed_spec.rb b/spec/lib/gitlab/ci/stage/seed_spec.rb
index 15bcce04447..f4353040ce6 100644
--- a/spec/lib/gitlab/ci/stage/seed_spec.rb
+++ b/spec/lib/gitlab/ci/stage/seed_spec.rb
@@ -21,10 +21,9 @@ describe Gitlab::Ci::Stage::Seed do
   describe '#builds' do
     it 'returns hash attributes of all builds' do
       expect(subject.builds.size).to eq 2
-      expect(subject.builds).to all(include(pipeline: pipeline))
-      expect(subject.builds).to all(include(project: pipeline.project))
       expect(subject.builds).to all(include(ref: 'master'))
       expect(subject.builds).to all(include(tag: false))
+      expect(subject.builds).to all(include(project: pipeline.project))
       expect(subject.builds)
         .to all(include(trigger_request: pipeline.trigger_requests.first))
     end
-- 
cgit v1.2.3


From ef9d9ddeb2e063fa8ed1b01e4f82cc9662b919b2 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Mon, 22 May 2017 15:47:04 +0200
Subject: Add tests for metrics behavior

---
 spec/lib/gitlab/metrics_spec.rb | 125 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 125 insertions(+)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/metrics_spec.rb b/spec/lib/gitlab/metrics_spec.rb
index 208a8d028cd..65bd06cda08 100644
--- a/spec/lib/gitlab/metrics_spec.rb
+++ b/spec/lib/gitlab/metrics_spec.rb
@@ -13,6 +13,18 @@ describe Gitlab::Metrics do
     end
   end
 
+  describe '.prometheus_metrics_enabled?' do
+    it 'returns a boolean' do
+      expect([true, false].include?(described_class.prometheus_metrics_enabled?)).to eq(true)
+    end
+  end
+
+  describe '.influx_metrics_enabled?' do
+    it 'returns a boolean' do
+      expect([true, false].include?(described_class.influx_metrics_enabled?)).to eq(true)
+    end
+  end
+
   describe '.submit_metrics' do
     it 'prepares and writes the metrics to InfluxDB' do
       connection = double(:connection)
@@ -177,4 +189,117 @@ describe Gitlab::Metrics do
       end
     end
   end
+
+  shared_examples 'prometheus metrics API' do
+    describe '#counter' do
+      subject { described_class.counter(:couter, 'doc') }
+
+      describe '#increment' do
+        it { expect { subject.increment }.not_to raise_exception }
+        it { expect { subject.increment({}) }.not_to raise_exception }
+        it { expect { subject.increment({}, 1) }.not_to raise_exception }
+      end
+    end
+
+    describe '#summary' do
+      subject { described_class.summary(:summary, 'doc') }
+
+      describe '#observe' do
+        it { expect { subject.observe({}, 2) }.not_to raise_exception }
+      end
+    end
+
+    describe '#gauge' do
+      subject { described_class.gauge(:gauge, 'doc') }
+
+      describe '#observe' do
+        it { expect { subject.set({}, 1) }.not_to raise_exception }
+      end
+    end
+
+    describe '#histogram' do
+      subject { described_class.histogram(:histogram, 'doc') }
+
+      describe '#observe' do
+        it { expect { subject.observe({}, 2) }.not_to raise_exception }
+      end
+    end
+  end
+
+  context 'prometheus metrics disabled' do
+    before do
+      allow(described_class).to receive(:prometheus_metrics_enabled?).and_return(false)
+    end
+
+    it_behaves_like 'prometheus metrics API'
+
+    describe '#dummy_metric' do
+      subject { described_class.provide_metric(:test) }
+
+      it { is_expected.to be_a(Gitlab::Metrics::DummyMetric) }
+    end
+
+    describe '#counter' do
+      subject { described_class.counter(:counter, 'doc') }
+
+      it { is_expected.to be_a(Gitlab::Metrics::DummyMetric) }
+
+    end
+
+    describe '#summary' do
+      subject { described_class.summary(:summary, 'doc') }
+
+      it { is_expected.to be_a(Gitlab::Metrics::DummyMetric) }
+    end
+
+    describe '#gauge' do
+      subject { described_class.gauge(:gauge, 'doc') }
+
+      it { is_expected.to be_a(Gitlab::Metrics::DummyMetric) }
+    end
+
+    describe '#histogram' do
+      subject { described_class.histogram(:histogram, 'doc') }
+
+      it { is_expected.to be_a(Gitlab::Metrics::DummyMetric) }
+    end
+  end
+
+  context 'prometheus metrics enabled' do
+    before do
+      allow(described_class).to receive(:prometheus_metrics_enabled?).and_return(true)
+    end
+
+    it_behaves_like 'prometheus metrics API'
+
+    describe '#dummy_metric' do
+      subject { described_class.provide_metric(:test) }
+
+      it { is_expected.to be_nil }
+    end
+
+    describe '#counter' do
+      subject { described_class.counter(:name, 'doc') }
+
+      it { is_expected.not_to be_a(Gitlab::Metrics::DummyMetric) }
+    end
+
+    describe '#summary' do
+      subject { described_class.summary(:name, 'doc') }
+
+      it { is_expected.not_to be_a(Gitlab::Metrics::DummyMetric) }
+    end
+
+    describe '#gauge' do
+      subject { described_class.gauge(:name, 'doc') }
+
+      it { is_expected.not_to be_a(Gitlab::Metrics::DummyMetric) }
+    end
+
+    describe '#histogram' do
+      subject { described_class.histogram(:name, 'doc') }
+
+      it { is_expected.not_to be_a(Gitlab::Metrics::DummyMetric) }
+    end
+  end
 end
-- 
cgit v1.2.3


From 21561f3434021ad35d45c449f489802fd1dced67 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Mon, 22 May 2017 19:49:34 +0200
Subject: Correctly handle temporary folder for testing multiproces metrics

---
 spec/lib/gitlab/metrics_spec.rb | 1 -
 1 file changed, 1 deletion(-)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/metrics_spec.rb b/spec/lib/gitlab/metrics_spec.rb
index 65bd06cda08..020bdbacead 100644
--- a/spec/lib/gitlab/metrics_spec.rb
+++ b/spec/lib/gitlab/metrics_spec.rb
@@ -243,7 +243,6 @@ describe Gitlab::Metrics do
       subject { described_class.counter(:counter, 'doc') }
 
       it { is_expected.to be_a(Gitlab::Metrics::DummyMetric) }
-
     end
 
     describe '#summary' do
-- 
cgit v1.2.3


From 394e962e52efdff36e3fae974ea51e9e2883f382 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Tue, 23 May 2017 16:16:23 +0200
Subject: Make tests of Gitlab::Metrics use explicit descriptions.

---
 spec/lib/gitlab/metrics_spec.rb | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/metrics_spec.rb b/spec/lib/gitlab/metrics_spec.rb
index 020bdbacead..863868e1576 100644
--- a/spec/lib/gitlab/metrics_spec.rb
+++ b/spec/lib/gitlab/metrics_spec.rb
@@ -9,19 +9,19 @@ describe Gitlab::Metrics do
 
   describe '.enabled?' do
     it 'returns a boolean' do
-      expect([true, false].include?(described_class.enabled?)).to eq(true)
+      expect(described_class.enabled?).to be_in([true, false])
     end
   end
 
   describe '.prometheus_metrics_enabled?' do
     it 'returns a boolean' do
-      expect([true, false].include?(described_class.prometheus_metrics_enabled?)).to eq(true)
+      expect(described_class.prometheus_metrics_enabled?).to be_in([true, false])
     end
   end
 
   describe '.influx_metrics_enabled?' do
     it 'returns a boolean' do
-      expect([true, false].include?(described_class.influx_metrics_enabled?)).to eq(true)
+      expect(described_class.influx_metrics_enabled?).to be_in([true, false])
     end
   end
 
@@ -195,9 +195,17 @@ describe Gitlab::Metrics do
       subject { described_class.counter(:couter, 'doc') }
 
       describe '#increment' do
-        it { expect { subject.increment }.not_to raise_exception }
-        it { expect { subject.increment({}) }.not_to raise_exception }
-        it { expect { subject.increment({}, 1) }.not_to raise_exception }
+        it 'successfully calls #increment without arguments' do
+          expect { subject.increment }.not_to raise_exception
+        end
+
+        it 'successfully calls #increment with 1 argument' do
+          expect { subject.increment({}) }.not_to raise_exception
+        end
+
+        it 'successfully calls #increment with 2 arguments' do
+          expect { subject.increment({}, 1) }.not_to raise_exception
+        end
       end
     end
 
@@ -205,15 +213,19 @@ describe Gitlab::Metrics do
       subject { described_class.summary(:summary, 'doc') }
 
       describe '#observe' do
-        it { expect { subject.observe({}, 2) }.not_to raise_exception }
+        it 'successfully calls #observe with 2 arguments' do
+          expect { subject.observe({}, 2) }.not_to raise_exception
+        end
       end
     end
 
     describe '#gauge' do
       subject { described_class.gauge(:gauge, 'doc') }
 
-      describe '#observe' do
-        it { expect { subject.set({}, 1) }.not_to raise_exception }
+      describe '#set' do
+        it 'successfully calls #set with 2 arguments' do
+          expect { subject.set({}, 1) }.not_to raise_exception
+        end
       end
     end
 
@@ -221,7 +233,9 @@ describe Gitlab::Metrics do
       subject { described_class.histogram(:histogram, 'doc') }
 
       describe '#observe' do
-        it { expect { subject.observe({}, 2) }.not_to raise_exception }
+        it 'successfully calls #observe with 2 arguments' do
+          expect { subject.observe({}, 2) }.not_to raise_exception
+        end
       end
     end
   end
-- 
cgit v1.2.3


From c134a72cdb7e6de8b70dc60de99cf4edc68a9227 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Mon, 29 May 2017 14:19:43 +0200
Subject: Move Prometheus presentation logic to PrometheusText

+ Use NullMetrics to mock metrics when unused
+ Use method_missing in NullMetrics mocking
+ Update prometheus gem to version that correctly uses transitive dependencies
+ Ensure correct folders are used in Multiprocess prometheus client tests.
+ rename Sessions controller's metric
---
 spec/lib/gitlab/metrics_spec.rb | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/metrics_spec.rb b/spec/lib/gitlab/metrics_spec.rb
index 863868e1576..87c9f4ebda4 100644
--- a/spec/lib/gitlab/metrics_spec.rb
+++ b/spec/lib/gitlab/metrics_spec.rb
@@ -1,6 +1,8 @@
 require 'spec_helper'
 
 describe Gitlab::Metrics do
+  include StubENV
+
   describe '.settings' do
     it 'returns a Hash' do
       expect(described_class.settings).to be_an_instance_of(Hash)
@@ -247,45 +249,53 @@ describe Gitlab::Metrics do
 
     it_behaves_like 'prometheus metrics API'
 
-    describe '#dummy_metric' do
+    describe '#null_metric' do
       subject { described_class.provide_metric(:test) }
 
-      it { is_expected.to be_a(Gitlab::Metrics::DummyMetric) }
+      it { is_expected.to be_a(Gitlab::Metrics::NullMetric) }
     end
 
     describe '#counter' do
       subject { described_class.counter(:counter, 'doc') }
 
-      it { is_expected.to be_a(Gitlab::Metrics::DummyMetric) }
+      it { is_expected.to be_a(Gitlab::Metrics::NullMetric) }
     end
 
     describe '#summary' do
       subject { described_class.summary(:summary, 'doc') }
 
-      it { is_expected.to be_a(Gitlab::Metrics::DummyMetric) }
+      it { is_expected.to be_a(Gitlab::Metrics::NullMetric) }
     end
 
     describe '#gauge' do
       subject { described_class.gauge(:gauge, 'doc') }
 
-      it { is_expected.to be_a(Gitlab::Metrics::DummyMetric) }
+      it { is_expected.to be_a(Gitlab::Metrics::NullMetric) }
     end
 
     describe '#histogram' do
       subject { described_class.histogram(:histogram, 'doc') }
 
-      it { is_expected.to be_a(Gitlab::Metrics::DummyMetric) }
+      it { is_expected.to be_a(Gitlab::Metrics::NullMetric) }
     end
   end
 
   context 'prometheus metrics enabled' do
+    around do |example|
+      Dir.mktmpdir do |tmp_dir|
+        @metrics_multiproc_dir = tmp_dir
+        example.run
+      end
+    end
+
     before do
+      stub_const('Prometheus::Client::Multiprocdir', @metrics_multiproc_dir)
       allow(described_class).to receive(:prometheus_metrics_enabled?).and_return(true)
     end
 
     it_behaves_like 'prometheus metrics API'
 
-    describe '#dummy_metric' do
+    describe '#null_metric' do
       subject { described_class.provide_metric(:test) }
 
       it { is_expected.to be_nil }
@@ -294,25 +304,25 @@ describe Gitlab::Metrics do
     describe '#counter' do
       subject { described_class.counter(:name, 'doc') }
 
-      it { is_expected.not_to be_a(Gitlab::Metrics::DummyMetric) }
+      it { is_expected.not_to be_a(Gitlab::Metrics::NullMetric) }
     end
 
     describe '#summary' do
       subject { described_class.summary(:name, 'doc') }
 
-      it { is_expected.not_to be_a(Gitlab::Metrics::DummyMetric) }
+      it { is_expected.not_to be_a(Gitlab::Metrics::NullMetric) }
     end
 
     describe '#gauge' do
       subject { described_class.gauge(:name, 'doc') }
 
-      it { is_expected.not_to be_a(Gitlab::Metrics::DummyMetric) }
+      it { is_expected.not_to be_a(Gitlab::Metrics::NullMetric) }
     end
 
     describe '#histogram' do
       subject { described_class.histogram(:name, 'doc') }
 
-      it { is_expected.not_to be_a(Gitlab::Metrics::DummyMetric) }
+      it { is_expected.not_to be_a(Gitlab::Metrics::NullMetric) }
     end
   end
 end
-- 
cgit v1.2.3


From ae8f7666e597493ab404f8524c1216a924338291 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Mon, 29 May 2017 23:23:19 +0200
Subject: Add prometheus text formatter  + rename controler method to #index
 from #metrics  + remove assertion from nullMetric

---
 .../health_checks/prometheus_text_format_spec.rb   | 44 ++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 spec/lib/gitlab/health_checks/prometheus_text_format_spec.rb

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/health_checks/prometheus_text_format_spec.rb b/spec/lib/gitlab/health_checks/prometheus_text_format_spec.rb
new file mode 100644
index 00000000000..a9feab8ff78
--- /dev/null
+++ b/spec/lib/gitlab/health_checks/prometheus_text_format_spec.rb
@@ -0,0 +1,44 @@
+describe Gitlab::HealthChecks::PrometheusTextFormat do
+  let(:metric_class) { Gitlab::HealthChecks::Metric }
+  subject { described_class.new }
+
+  describe '#marshal' do
+    let(:sample_metrics) do
+      [
+        metric_class.new('metric1', 1),
+        metric_class.new('metric2', 2)
+      ]
+    end
+
+    it 'marshal to text with non repeating type definition' do
+      expected = <<-EXPECTED
+# TYPE metric1 gauge
+metric1 1
+# TYPE metric2 gauge
+metric2 2
+EXPECTED
+      expect(subject.marshal(sample_metrics)).to eq(expected.chomp)
+    end
+
+    context 'metrics where name repeats' do
+      let(:sample_metrics) do
+        [
+          metric_class.new('metric1', 1),
+          metric_class.new('metric1', 2),
+          metric_class.new('metric2', 3)
+        ]
+      end
+
+      it 'marshal to text with non repeating type definition' do
+        expected = <<-EXPECTED
+# TYPE metric1 gauge
+metric1 1
+metric1 2
+# TYPE metric2 gauge
+metric2 3
+        EXPECTED
+        expect(subject.marshal(sample_metrics)).to eq(expected.chomp)
+      end
+    end
+  end
+end
-- 
cgit v1.2.3


From c86e1437eb415e816dcc29f0b1acafeed2dcc266 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Fri, 2 Jun 2017 14:21:58 +0200
Subject: Make fixture message more descriptive + use strip_heredoc to make the
 text in tests much more readable

---
 .../health_checks/prometheus_text_format_spec.rb   | 25 +++++++++++-----------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/health_checks/prometheus_text_format_spec.rb b/spec/lib/gitlab/health_checks/prometheus_text_format_spec.rb
index a9feab8ff78..b07f95443ee 100644
--- a/spec/lib/gitlab/health_checks/prometheus_text_format_spec.rb
+++ b/spec/lib/gitlab/health_checks/prometheus_text_format_spec.rb
@@ -11,12 +11,13 @@ describe Gitlab::HealthChecks::PrometheusTextFormat do
     end
 
     it 'marshal to text with non repeating type definition' do
-      expected = <<-EXPECTED
-# TYPE metric1 gauge
-metric1 1
-# TYPE metric2 gauge
-metric2 2
-EXPECTED
+      expected = <<-EXPECTED.strip_heredoc
+        # TYPE metric1 gauge
+        metric1 1
+        # TYPE metric2 gauge
+        metric2 2
+      EXPECTED
+
       expect(subject.marshal(sample_metrics)).to eq(expected.chomp)
     end
 
@@ -30,12 +31,12 @@ EXPECTED
       end
 
       it 'marshal to text with non repeating type definition' do
-        expected = <<-EXPECTED
-# TYPE metric1 gauge
-metric1 1
-metric1 2
-# TYPE metric2 gauge
-metric2 3
+        expected = <<-EXPECTED.strip_heredoc
+          # TYPE metric1 gauge
+          metric1 1
+          metric1 2
+          # TYPE metric2 gauge
+          metric2 3
         EXPECTED
         expect(subject.marshal(sample_metrics)).to eq(expected.chomp)
       end
-- 
cgit v1.2.3


From 6a67148ed3543ee5073ab49dc4e825f3d87cc8b5 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Fri, 2 Jun 2017 15:25:54 +0200
Subject: Make production settings fixture use
 Gitlab::CurrentSettings.current_application_settings

	small code formatting changes
---
 .../gitlab/health_checks/prometheus_text_format_spec.rb    | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/health_checks/prometheus_text_format_spec.rb b/spec/lib/gitlab/health_checks/prometheus_text_format_spec.rb
index b07f95443ee..7573792789a 100644
--- a/spec/lib/gitlab/health_checks/prometheus_text_format_spec.rb
+++ b/spec/lib/gitlab/health_checks/prometheus_text_format_spec.rb
@@ -4,10 +4,8 @@ describe Gitlab::HealthChecks::PrometheusTextFormat do
 
   describe '#marshal' do
     let(:sample_metrics) do
-      [
-        metric_class.new('metric1', 1),
-        metric_class.new('metric2', 2)
-      ]
+      [metric_class.new('metric1', 1),
+       metric_class.new('metric2', 2)]
     end
 
     it 'marshal to text with non repeating type definition' do
@@ -23,11 +21,9 @@ describe Gitlab::HealthChecks::PrometheusTextFormat do
 
     context 'metrics where name repeats' do
       let(:sample_metrics) do
-        [
-          metric_class.new('metric1', 1),
-          metric_class.new('metric1', 2),
-          metric_class.new('metric2', 3)
-        ]
+        [metric_class.new('metric1', 1),
+         metric_class.new('metric1', 2),
+         metric_class.new('metric2', 3)]
       end
 
       it 'marshal to text with non repeating type definition' do
-- 
cgit v1.2.3


From d26573c6e3de535f69437deaf54d5c151ac343c8 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Fri, 2 Jun 2017 15:55:44 +0200
Subject: Make PrometheusTextFormat return proper output terminated with '\n'

remove file dangling after rebase
---
 spec/lib/gitlab/health_checks/prometheus_text_format_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/health_checks/prometheus_text_format_spec.rb b/spec/lib/gitlab/health_checks/prometheus_text_format_spec.rb
index 7573792789a..ed757ed60d8 100644
--- a/spec/lib/gitlab/health_checks/prometheus_text_format_spec.rb
+++ b/spec/lib/gitlab/health_checks/prometheus_text_format_spec.rb
@@ -16,7 +16,7 @@ describe Gitlab::HealthChecks::PrometheusTextFormat do
         metric2 2
       EXPECTED
 
-      expect(subject.marshal(sample_metrics)).to eq(expected.chomp)
+      expect(subject.marshal(sample_metrics)).to eq(expected)
     end
 
     context 'metrics where name repeats' do
@@ -34,7 +34,7 @@ describe Gitlab::HealthChecks::PrometheusTextFormat do
           # TYPE metric2 gauge
           metric2 3
         EXPECTED
-        expect(subject.marshal(sample_metrics)).to eq(expected.chomp)
+        expect(subject.marshal(sample_metrics)).to eq(expected)
       end
     end
   end
-- 
cgit v1.2.3


From 0b81b5ace0dd7c5ba3362238d8be41ce178e1ecc Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <git@zjvandeweg.nl>
Date: Wed, 31 May 2017 15:55:12 +0200
Subject: Create read_registry scope with JWT auth

This is the first commit doing mainly 3 things:
1. create a new scope and allow users to use it
2. Have the JWTController respond correctly on this
3. Updates documentation to suggest usage of PATs

There is one gotcha, there will be no support for impersonation tokens, as this
seems not needed.

Fixes gitlab-org/gitlab-ce#19219
---
 spec/lib/gitlab/auth_spec.rb | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/auth_spec.rb b/spec/lib/gitlab/auth_spec.rb
index 50bc3ef1b7c..6574e6d0087 100644
--- a/spec/lib/gitlab/auth_spec.rb
+++ b/spec/lib/gitlab/auth_spec.rb
@@ -143,6 +143,13 @@ describe Gitlab::Auth, lib: true do
         expect(gl_auth.find_for_git_client('', personal_access_token.token, project: nil, ip: 'ip')).to eq(Gitlab::Auth::Result.new(personal_access_token.user, nil, :personal_token, full_authentication_abilities))
       end
 
+      it 'succeeds for personal access tokens with the `read_registry` scope' do
+        personal_access_token = create(:personal_access_token, scopes: ['read_registry'])
+
+        expect(gl_auth).to receive(:rate_limit!).with('ip', success: true, login: '')
+        expect(gl_auth.find_for_git_client('', personal_access_token.token, project: nil, ip: 'ip')).to eq(Gitlab::Auth::Result.new(personal_access_token.user, nil, :personal_token, [:read_container_image]))
+      end
+
       it 'succeeds if it is an impersonation token' do
         impersonation_token = create(:personal_access_token, :impersonation, scopes: ['api'])
 
-- 
cgit v1.2.3


From 3801a0df80306a76dc340ca74427a124a1514dbb Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 5 Jun 2017 10:34:30 +0200
Subject: Export pipeline stages in import/export feature

---
 spec/lib/gitlab/import_export/all_models.yml            | 7 +++++++
 spec/lib/gitlab/import_export/safe_model_attributes.yml | 7 +++++++
 2 files changed, 14 insertions(+)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index 34f617e23a5..6e6e94d0bbb 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -91,6 +91,7 @@ merge_request_diff:
 pipelines:
 - project
 - user
+- stages
 - statuses
 - builds
 - trigger_requests
@@ -104,9 +105,15 @@ pipelines:
 - artifacts
 - pipeline_schedule
 - merge_requests
+stages:
+- project
+- pipeline
+- statuses
+- builds
 statuses:
 - project
 - pipeline
+- stage
 - user
 - auto_canceled_by
 variables:
diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml
index 2388aea24d9..37783f63843 100644
--- a/spec/lib/gitlab/import_export/safe_model_attributes.yml
+++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml
@@ -191,6 +191,13 @@ Ci::Pipeline:
 - lock_version
 - auto_canceled_by_id
 - pipeline_schedule_id
+Ci::Stage:
+- id
+- name
+- project_id
+- pipeline_id
+- created_at
+- updated_at
 CommitStatus:
 - id
 - project_id
-- 
cgit v1.2.3


From 8808e7bcf518e16fa36762a9b01f6cf224233f06 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 5 Jun 2017 12:54:52 +0200
Subject: Add assertions about new pipeline stage in specs

---
 spec/lib/gitlab/ci/stage/seed_spec.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/ci/stage/seed_spec.rb b/spec/lib/gitlab/ci/stage/seed_spec.rb
index f4353040ce6..47a797cfe8f 100644
--- a/spec/lib/gitlab/ci/stage/seed_spec.rb
+++ b/spec/lib/gitlab/ci/stage/seed_spec.rb
@@ -48,6 +48,10 @@ describe Gitlab::Ci::Stage::Seed do
       expect(pipeline.builds).to all(satisfy { |job| job.stage_id.present? })
       expect(pipeline.builds).to all(satisfy { |job| job.pipeline.present? })
       expect(pipeline.builds).to all(satisfy { |job| job.project.present? })
+      expect(pipeline.stages)
+        .to all(satisfy { |stage| stage.pipeline.present? })
+      expect(pipeline.stages)
+        .to all(satisfy { |stage| stage.project.present? })
     end
   end
 end
-- 
cgit v1.2.3


From 25b26c2f2844178d66a6fde7f728a5e72841e9d2 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 5 Jun 2017 15:01:15 +0200
Subject: Fix typo in import/export safe model attributes

---
 spec/lib/gitlab/import_export/safe_model_attributes.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml
index 24665645277..34457bf36fe 100644
--- a/spec/lib/gitlab/import_export/safe_model_attributes.yml
+++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml
@@ -199,7 +199,7 @@ Ci::Stage:
 - pipeline_id
 - created_at
 - updated_at
-ommitStatus:
+CommitStatus:
 - id
 - project_id
 - status
-- 
cgit v1.2.3


From da0852e08aa07354706be1e0be9251ccf02e85be Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 5 Jun 2017 15:23:09 +0200
Subject: Improve specs for pipeline and pipeline seeds

---
 spec/lib/gitlab/ci/stage/seed_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/ci/stage/seed_spec.rb b/spec/lib/gitlab/ci/stage/seed_spec.rb
index 47a797cfe8f..d7e91a5a62c 100644
--- a/spec/lib/gitlab/ci/stage/seed_spec.rb
+++ b/spec/lib/gitlab/ci/stage/seed_spec.rb
@@ -30,7 +30,7 @@ describe Gitlab::Ci::Stage::Seed do
   end
 
   describe '#user=' do
-    let(:user) { create(:user) }
+    let(:user) { build(:user) }
 
     it 'assignes relevant pipeline attributes' do
       subject.user = user
-- 
cgit v1.2.3


From 9fcc3e5982311a380681c822df72fe470a5ea1ca Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <git@zjvandeweg.nl>
Date: Tue, 6 Jun 2017 13:18:01 +0200
Subject: Fix test failures

---
 spec/lib/gitlab/auth_spec.rb | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/auth_spec.rb b/spec/lib/gitlab/auth_spec.rb
index 6574e6d0087..d6006eab0c9 100644
--- a/spec/lib/gitlab/auth_spec.rb
+++ b/spec/lib/gitlab/auth_spec.rb
@@ -17,7 +17,11 @@ describe Gitlab::Auth, lib: true do
     end
 
     it 'OPTIONAL_SCOPES contains all non-default scopes' do
-      expect(subject::OPTIONAL_SCOPES).to eq [:read_user, :openid]
+      expect(subject::OPTIONAL_SCOPES).to eq %i[read_user read_registry openid]
+    end
+
+    it 'REGISTRY_SCOPES contains all registry related scopes' do
+      expect(subject::REGISTRY_SCOPES).to eq %i[read_registry]
     end
   end
 
@@ -157,18 +161,11 @@ describe Gitlab::Auth, lib: true do
         expect(gl_auth.find_for_git_client('', impersonation_token.token, project: nil, ip: 'ip')).to eq(Gitlab::Auth::Result.new(impersonation_token.user, nil, :personal_token, full_authentication_abilities))
       end
 
-      it 'fails for personal access tokens with other scopes' do
+      it 'limits abilities based on scope' do
         personal_access_token = create(:personal_access_token, scopes: ['read_user'])
 
-        expect(gl_auth).to receive(:rate_limit!).with('ip', success: false, login: '')
-        expect(gl_auth.find_for_git_client('', personal_access_token.token, project: nil, ip: 'ip')).to eq(Gitlab::Auth::Result.new(nil, nil))
-      end
-
-      it 'fails for impersonation token with other scopes' do
-        impersonation_token = create(:personal_access_token, scopes: ['read_user'])
-
-        expect(gl_auth).to receive(:rate_limit!).with('ip', success: false, login: '')
-        expect(gl_auth.find_for_git_client('', impersonation_token.token, project: nil, ip: 'ip')).to eq(Gitlab::Auth::Result.new(nil, nil))
+        expect(gl_auth).to receive(:rate_limit!).with('ip', success: true, login: '')
+        expect(gl_auth.find_for_git_client('', personal_access_token.token, project: nil, ip: 'ip')).to eq(Gitlab::Auth::Result.new(personal_access_token.user, nil, :personal_token, []))
       end
 
       it 'fails if password is nil' do
-- 
cgit v1.2.3


From 3a5d375e49b808ca203cb40b5f907aafb40f53aa Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Tue, 6 Jun 2017 11:46:28 -0500
Subject: Fix Diff::Position#diff_file for positions on straight diffs

---
 spec/lib/gitlab/diff/diff_refs_spec.rb | 61 ++++++++++++++++++++++++++++++++++
 spec/lib/gitlab/diff/position_spec.rb  | 48 ++++++++++++++++++++++++++
 spec/lib/gitlab/git/compare_spec.rb    |  4 +--
 3 files changed, 111 insertions(+), 2 deletions(-)
 create mode 100644 spec/lib/gitlab/diff/diff_refs_spec.rb

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/diff/diff_refs_spec.rb b/spec/lib/gitlab/diff/diff_refs_spec.rb
new file mode 100644
index 00000000000..a8173558c00
--- /dev/null
+++ b/spec/lib/gitlab/diff/diff_refs_spec.rb
@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+describe Gitlab::Diff::DiffRefs, lib: true do
+  let(:project) { create(:project, :repository) }
+
+  describe '#compare_in' do
+    context 'with diff refs for the initial commit' do
+      let(:commit) { project.commit('1a0b36b3cdad1d2ee32457c102a8c0b7056fa863') }
+      subject { commit.diff_refs }
+
+      it 'returns an appropriate comparison' do
+        compare = subject.compare_in(project)
+
+        expect(compare.diff_refs).to eq(subject)
+      end
+    end
+
+    context 'with diff refs for a commit' do
+      let(:commit) { project.commit('6f6d7e7ed97bb5f0054f2b1df789b39ca89b6ff9') }
+      subject { commit.diff_refs }
+
+      it 'returns an appropriate comparison' do
+        compare = subject.compare_in(project)
+
+        expect(compare.diff_refs).to eq(subject)
+      end
+    end
+
+    context 'with diff refs for a comparison through the base' do
+      subject do
+        described_class.new(
+          start_sha: '0b4bc9a49b562e85de7cc9e834518ea6828729b9', # feature
+          base_sha: 'ae73cb07c9eeaf35924a10f713b364d32b2dd34f',
+          head_sha: 'e63f41fe459e62e1228fcef60d7189127aeba95a' # master
+        )
+      end
+
+      it 'returns an appropriate comparison' do
+        compare = subject.compare_in(project)
+
+        expect(compare.diff_refs).to eq(subject)
+      end
+    end
+
+    context 'with diff refs for a straight comparison' do
+      subject do
+        described_class.new(
+          start_sha: '0b4bc9a49b562e85de7cc9e834518ea6828729b9', # feature
+          base_sha: '0b4bc9a49b562e85de7cc9e834518ea6828729b9',
+          head_sha: 'e63f41fe459e62e1228fcef60d7189127aeba95a' # master
+        )
+      end
+
+      it 'returns an appropriate comparison' do
+        compare = subject.compare_in(project)
+
+        expect(compare.diff_refs).to eq(subject)
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/diff/position_spec.rb b/spec/lib/gitlab/diff/position_spec.rb
index 7095104d75c..b3d46e69ccb 100644
--- a/spec/lib/gitlab/diff/position_spec.rb
+++ b/spec/lib/gitlab/diff/position_spec.rb
@@ -381,6 +381,54 @@ describe Gitlab::Diff::Position, lib: true do
     end
   end
 
+  describe "position for a file in a straight comparison" do
+    let(:diff_refs) do
+      Gitlab::Diff::DiffRefs.new(
+        start_sha: '0b4bc9a49b562e85de7cc9e834518ea6828729b9', # feature
+        base_sha: '0b4bc9a49b562e85de7cc9e834518ea6828729b9',
+        head_sha: 'e63f41fe459e62e1228fcef60d7189127aeba95a' # master
+      )
+    end
+
+    subject do
+      described_class.new(
+        old_path: "files/ruby/feature.rb",
+        new_path: "files/ruby/feature.rb",
+        old_line: 3,
+        new_line: nil,
+        diff_refs: diff_refs
+      )
+    end
+
+    describe "#diff_file" do
+      it "returns the correct diff file" do
+        diff_file = subject.diff_file(project.repository)
+
+        expect(diff_file.deleted_file?).to be true
+        expect(diff_file.old_path).to eq(subject.old_path)
+        expect(diff_file.diff_refs).to eq(subject.diff_refs)
+      end
+    end
+
+    describe "#diff_line" do
+      it "returns the correct diff line" do
+        diff_line = subject.diff_line(project.repository)
+
+        expect(diff_line.removed?).to be true
+        expect(diff_line.old_line).to eq(subject.old_line)
+        expect(diff_line.text).to eq("-    puts 'bar'")
+      end
+    end
+
+    describe "#line_code" do
+      it "returns the correct line code" do
+        line_code = Gitlab::Diff::LineCode.generate(subject.file_path, 0, subject.old_line)
+
+        expect(subject.line_code(project.repository)).to eq(line_code)
+      end
+    end
+  end
+
   describe "#to_json" do
     let(:hash) do
       {
diff --git a/spec/lib/gitlab/git/compare_spec.rb b/spec/lib/gitlab/git/compare_spec.rb
index 7c45071ec45..4c9f4a28f32 100644
--- a/spec/lib/gitlab/git/compare_spec.rb
+++ b/spec/lib/gitlab/git/compare_spec.rb
@@ -2,8 +2,8 @@ require "spec_helper"
 
 describe Gitlab::Git::Compare, seed_helper: true do
   let(:repository) { Gitlab::Git::Repository.new('default', TEST_REPO_PATH) }
-  let(:compare) { Gitlab::Git::Compare.new(repository, SeedRepo::BigCommit::ID, SeedRepo::Commit::ID, false) }
-  let(:compare_straight) { Gitlab::Git::Compare.new(repository, SeedRepo::BigCommit::ID, SeedRepo::Commit::ID, true) }
+  let(:compare) { Gitlab::Git::Compare.new(repository, SeedRepo::BigCommit::ID, SeedRepo::Commit::ID, straight: false) }
+  let(:compare_straight) { Gitlab::Git::Compare.new(repository, SeedRepo::BigCommit::ID, SeedRepo::Commit::ID, straight: true) }
 
   describe '#commits' do
     subject do
-- 
cgit v1.2.3


From 1c59ba67a539e9ef7298b1c219123200eeb54b01 Mon Sep 17 00:00:00 2001
From: Pawel Chojnacki <pawel@chojnacki.ws>
Date: Wed, 7 Jun 2017 04:24:30 +0200
Subject: Do not cleanup temp directory as this apparently causes silent rspec
 failures on linux in CI

---
 spec/lib/gitlab/metrics_spec.rb | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/metrics_spec.rb b/spec/lib/gitlab/metrics_spec.rb
index 87c9f4ebda4..5a87b906609 100644
--- a/spec/lib/gitlab/metrics_spec.rb
+++ b/spec/lib/gitlab/metrics_spec.rb
@@ -281,15 +281,10 @@ describe Gitlab::Metrics do
   end
 
   context 'prometheus metrics enabled' do
-    around do |example|
-      Dir.mktmpdir do |tmp_dir|
-        @metrics_multiproc_dir = tmp_dir
-        example.run
-      end
-    end
+    let(:metrics_multiproc_dir) { Dir.mktmpdir }
 
     before do
-      stub_const('Prometheus::Client::Multiprocdir', @metrics_multiproc_dir)
+      stub_const('Prometheus::Client::Multiprocdir', metrics_multiproc_dir)
       allow(described_class).to receive(:prometheus_metrics_enabled?).and_return(true)
     end
 
-- 
cgit v1.2.3


From 6e92d902e6df21dcfba2b2b592137825822d9d88 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Wed, 7 Jun 2017 10:38:12 +0200
Subject: add repository spec

---
 spec/lib/gitlab/backup/repository_spec.rb | 35 +++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 spec/lib/gitlab/backup/repository_spec.rb

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/backup/repository_spec.rb b/spec/lib/gitlab/backup/repository_spec.rb
new file mode 100644
index 00000000000..3d4bc39e17c
--- /dev/null
+++ b/spec/lib/gitlab/backup/repository_spec.rb
@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe Backup::Repository, lib: true do
+  include StubENV
+
+  let(:progress) { StringIO.new }
+  let!(:project) { create(:empty_project) }
+
+  before do
+    allow(progress).to receive(:puts)
+    allow(progress).to receive(:print)
+
+    allow_any_instance_of(String).to receive(:color) do |string, _color|
+      string
+    end
+
+    @old_progress = $progress # rubocop:disable Style/GlobalVars
+    $progress = progress # rubocop:disable Style/GlobalVars
+  end
+
+  after do
+    $progress = @old_progress # rubocop:disable Style/GlobalVars
+  end
+
+  describe 'repo failure' do
+    before do
+      allow_any_instance_of(Project).to receive(:empty_repo?).and_raise(Rugged::OdbError)
+      allow(Gitlab::Popen).to receive(:popen).and_return(['normal output', 0])
+    end
+
+    it 'does not raise error' do
+      expect { described_class.new.dump }.not_to raise_error
+    end
+  end
+end
-- 
cgit v1.2.3


From 280529c7f40db6af7bb0bfd3ef30d330bbafc225 Mon Sep 17 00:00:00 2001
From: Adam Niedzielski <adamsunday@gmail.com>
Date: Wed, 7 Jun 2017 11:11:26 +0200
Subject: Fix incorrect ETag cache key when relative instance URL is used

---
 spec/lib/gitlab/etag_caching/middleware_spec.rb | 19 +++++++++++
 spec/lib/gitlab/etag_caching/router_spec.rb     | 44 ++++++++++++-------------
 2 files changed, 41 insertions(+), 22 deletions(-)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/etag_caching/middleware_spec.rb b/spec/lib/gitlab/etag_caching/middleware_spec.rb
index 24df04e985a..3c6ef7c7ccb 100644
--- a/spec/lib/gitlab/etag_caching/middleware_spec.rb
+++ b/spec/lib/gitlab/etag_caching/middleware_spec.rb
@@ -164,6 +164,25 @@ describe Gitlab::EtagCaching::Middleware do
     end
   end
 
+  context 'when GitLab instance is using a relative URL' do
+    before do
+      mock_app_response
+    end
+
+    it 'uses full path as cache key' do
+      env = {
+        'PATH_INFO' => enabled_path,
+        'SCRIPT_NAME' => '/relative-gitlab'
+      }
+
+      expect_any_instance_of(Gitlab::EtagCaching::Store)
+        .to receive(:get).with("/relative-gitlab#{enabled_path}")
+        .and_return(nil)
+
+      middleware.call(env)
+    end
+  end
+
   def mock_app_response
     allow(app).to receive(:call).and_return([app_status_code, {}, ['body']])
   end
diff --git a/spec/lib/gitlab/etag_caching/router_spec.rb b/spec/lib/gitlab/etag_caching/router_spec.rb
index 269798c7c9e..2bb40827fcf 100644
--- a/spec/lib/gitlab/etag_caching/router_spec.rb
+++ b/spec/lib/gitlab/etag_caching/router_spec.rb
@@ -2,115 +2,115 @@ require 'spec_helper'
 
 describe Gitlab::EtagCaching::Router do
   it 'matches issue notes endpoint' do
-    env = build_env(
+    request = build_request(
       '/my-group/and-subgroup/here-comes-the-project/noteable/issue/1/notes'
     )
 
-    result = described_class.match(env)
+    result = described_class.match(request)
 
     expect(result).to be_present
     expect(result.name).to eq 'issue_notes'
   end
 
   it 'matches issue title endpoint' do
-    env = build_env(
+    request = build_request(
       '/my-group/my-project/issues/123/realtime_changes'
     )
 
-    result = described_class.match(env)
+    result = described_class.match(request)
 
     expect(result).to be_present
     expect(result.name).to eq 'issue_title'
   end
 
   it 'matches project pipelines endpoint' do
-    env = build_env(
+    request = build_request(
       '/my-group/my-project/pipelines.json'
     )
 
-    result = described_class.match(env)
+    result = described_class.match(request)
 
     expect(result).to be_present
     expect(result.name).to eq 'project_pipelines'
   end
 
   it 'matches commit pipelines endpoint' do
-    env = build_env(
+    request = build_request(
       '/my-group/my-project/commit/aa8260d253a53f73f6c26c734c72fdd600f6e6d4/pipelines.json'
     )
 
-    result = described_class.match(env)
+    result = described_class.match(request)
 
     expect(result).to be_present
     expect(result.name).to eq 'commit_pipelines'
   end
 
   it 'matches new merge request pipelines endpoint' do
-    env = build_env(
+    request = build_request(
       '/my-group/my-project/merge_requests/new.json'
     )
 
-    result = described_class.match(env)
+    result = described_class.match(request)
 
     expect(result).to be_present
     expect(result.name).to eq 'new_merge_request_pipelines'
   end
 
   it 'matches merge request pipelines endpoint' do
-    env = build_env(
+    request = build_request(
       '/my-group/my-project/merge_requests/234/pipelines.json'
     )
 
-    result = described_class.match(env)
+    result = described_class.match(request)
 
     expect(result).to be_present
     expect(result.name).to eq 'merge_request_pipelines'
   end
 
   it 'matches build endpoint' do
-    env = build_env(
+    request = build_request(
       '/my-group/my-project/builds/234.json'
     )
 
-    result = described_class.match(env)
+    result = described_class.match(request)
 
     expect(result).to be_present
     expect(result.name).to eq 'project_build'
   end
 
   it 'does not match blob with confusing name' do
-    env = build_env(
+    request = build_request(
       '/my-group/my-project/blob/master/pipelines.json'
     )
 
-    result = described_class.match(env)
+    result = described_class.match(request)
 
     expect(result).to be_blank
   end
 
   it 'matches the environments path' do
-    env = build_env(
+    request = build_request(
       '/my-group/my-project/environments.json'
     )
 
-    result = described_class.match(env)
+    result = described_class.match(request)
     expect(result).to be_present
 
     expect(result.name).to eq 'environments'
   end
 
   it 'matches pipeline#show endpoint' do
-    env = build_env(
+    request = build_request(
       '/my-group/my-project/pipelines/2.json'
     )
 
-    result = described_class.match(env)
+    result = described_class.match(request)
 
     expect(result).to be_present
     expect(result.name).to eq 'project_pipeline'
   end
 
-  def build_env(path)
-    { 'PATH_INFO' => path }
+  def build_request(path)
+    double(path_info: path)
   end
 end
-- 
cgit v1.2.3


From 1b76c7196b3b50074e6f2eba64d988ead90e7264 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Wed, 7 Jun 2017 14:57:26 +0200
Subject: add more spec examples

---
 spec/lib/gitlab/backup/repository_spec.rb | 47 +++++++++++++++++++++++++++----
 1 file changed, 41 insertions(+), 6 deletions(-)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/backup/repository_spec.rb b/spec/lib/gitlab/backup/repository_spec.rb
index 3d4bc39e17c..5399b4ac805 100644
--- a/spec/lib/gitlab/backup/repository_spec.rb
+++ b/spec/lib/gitlab/backup/repository_spec.rb
@@ -22,14 +22,49 @@ describe Backup::Repository, lib: true do
     $progress = @old_progress # rubocop:disable Style/GlobalVars
   end
 
-  describe 'repo failure' do
-    before do
-      allow_any_instance_of(Project).to receive(:empty_repo?).and_raise(Rugged::OdbError)
-      allow(Gitlab::Popen).to receive(:popen).and_return(['normal output', 0])
+  describe '.dump' do
+    describe 'repo failure' do
+      before do
+        allow_any_instance_of(Project).to receive(:empty_repo?).and_raise(Rugged::OdbError)
+        allow(Gitlab::Popen).to receive(:popen).and_return(['normal output', 0])
+      end
+
+      it 'does not raise error' do
+        expect { described_class.new.dump }.not_to raise_error
+      end
+
+      it 'shows the appropriate error' do
+        described_class.new.dump
+
+        expect(progress).to have_received(:puts).with("Ignoring error on #{project.full_path} repository - Rugged::OdbError")
+      end
+    end
+
+    describe 'command failure' do
+      before do
+        allow_any_instance_of(Project).to receive(:empty_repo?).and_return(false)
+        allow(Gitlab::Popen).to receive(:popen).and_return(['error', 1])
+      end
+
+      it 'shows the appropriate error' do
+        described_class.new.dump
+
+        expect(progress).to have_received(:puts).with("Ignoring error on #{project.full_path} - error")
+      end
     end
+  end
+
+  describe '.restore' do
+    describe 'command failure' do
+      before do
+        allow(Gitlab::Popen).to receive(:popen).and_return(['error', 1])
+      end
+
+      it 'shows the appropriate error' do
+        described_class.new.restore
 
-    it 'does not raise error' do
-      expect { described_class.new.dump }.not_to raise_error
+        expect(progress).to have_received(:puts).with("Ignoring error on #{project.full_path} - error")
+      end
     end
   end
 end
-- 
cgit v1.2.3


From 8f07afe31121f61e71db8b8fc45455066a5453f4 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Wed, 7 Jun 2017 15:44:58 +0200
Subject: fix spec and added changelog

---
 spec/lib/gitlab/backup/repository_spec.rb | 2 --
 1 file changed, 2 deletions(-)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/backup/repository_spec.rb b/spec/lib/gitlab/backup/repository_spec.rb
index 5399b4ac805..2d62e8c7b47 100644
--- a/spec/lib/gitlab/backup/repository_spec.rb
+++ b/spec/lib/gitlab/backup/repository_spec.rb
@@ -1,8 +1,6 @@
 require 'spec_helper'
 
 describe Backup::Repository, lib: true do
-  include StubENV
-
   let(:progress) { StringIO.new }
   let!(:project) { create(:empty_project) }
 
-- 
cgit v1.2.3


From e2eb0b6f77e66fee1bb50e86ebbc013e1afb784e Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Wed, 7 Jun 2017 15:49:35 +0200
Subject: fix spec and added changelog

---
 spec/lib/gitlab/backup/repository_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/backup/repository_spec.rb b/spec/lib/gitlab/backup/repository_spec.rb
index 2d62e8c7b47..7d0d537f2f2 100644
--- a/spec/lib/gitlab/backup/repository_spec.rb
+++ b/spec/lib/gitlab/backup/repository_spec.rb
@@ -20,7 +20,7 @@ describe Backup::Repository, lib: true do
     $progress = @old_progress # rubocop:disable Style/GlobalVars
   end
 
-  describe '.dump' do
+  describe '#dump' do
     describe 'repo failure' do
       before do
         allow_any_instance_of(Project).to receive(:empty_repo?).and_raise(Rugged::OdbError)
@@ -52,7 +52,7 @@ describe Backup::Repository, lib: true do
     end
   end
 
-  describe '.restore' do
+  describe '#restore' do
     describe 'command failure' do
       before do
         allow(Gitlab::Popen).to receive(:popen).and_return(['error', 1])
-- 
cgit v1.2.3


From 8acb0f55961500658377a1f941584dddb7952570 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Wed, 7 Jun 2017 16:50:21 +0200
Subject: refactor code and spec

---
 spec/lib/gitlab/backup/repository_spec.rb | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/backup/repository_spec.rb b/spec/lib/gitlab/backup/repository_spec.rb
index 7d0d537f2f2..51c1e9d657b 100644
--- a/spec/lib/gitlab/backup/repository_spec.rb
+++ b/spec/lib/gitlab/backup/repository_spec.rb
@@ -12,18 +12,13 @@ describe Backup::Repository, lib: true do
       string
     end
 
-    @old_progress = $progress # rubocop:disable Style/GlobalVars
-    $progress = progress # rubocop:disable Style/GlobalVars
-  end
-
-  after do
-    $progress = @old_progress # rubocop:disable Style/GlobalVars
+    allow_any_instance_of(described_class).to receive(:progress).and_return(progress)
   end
 
   describe '#dump' do
     describe 'repo failure' do
       before do
-        allow_any_instance_of(Project).to receive(:empty_repo?).and_raise(Rugged::OdbError)
+        allow_any_instance_of(Repository).to receive(:empty_repo?).and_raise(Rugged::OdbError)
         allow(Gitlab::Popen).to receive(:popen).and_return(['normal output', 0])
       end
 
@@ -34,13 +29,13 @@ describe Backup::Repository, lib: true do
       it 'shows the appropriate error' do
         described_class.new.dump
 
-        expect(progress).to have_received(:puts).with("Ignoring error on #{project.full_path} repository - Rugged::OdbError")
+        expect(progress).to have_received(:puts).with("Ignoring repository error and continuing backing up project: #{project.full_path} - Rugged::OdbError")
       end
     end
 
     describe 'command failure' do
       before do
-        allow_any_instance_of(Project).to receive(:empty_repo?).and_return(false)
+        allow_any_instance_of(Repository).to receive(:empty_repo?).and_return(false)
         allow(Gitlab::Popen).to receive(:popen).and_return(['error', 1])
       end
 
-- 
cgit v1.2.3


From 469acd190e497cda8516da0ee481f33e038d7e9e Mon Sep 17 00:00:00 2001
From: Robin Bobbitt <ryehle@us.ibm.com>
Date: Tue, 6 Jun 2017 11:39:54 -0400
Subject: Sync email address from specified omniauth provider

---
 spec/lib/gitlab/ldap/user_spec.rb   | 14 +++++++-----
 spec/lib/gitlab/o_auth/user_spec.rb | 44 +++++++++++++++++++++++++++++++++----
 2 files changed, 49 insertions(+), 9 deletions(-)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/ldap/user_spec.rb b/spec/lib/gitlab/ldap/user_spec.rb
index f4aab429931..a0eda685ca3 100644
--- a/spec/lib/gitlab/ldap/user_spec.rb
+++ b/spec/lib/gitlab/ldap/user_spec.rb
@@ -37,7 +37,7 @@ describe Gitlab::LDAP::User, lib: true do
     end
 
     it "does not mark existing ldap user as changed" do
-      create(:omniauth_user, email: 'john@example.com', extern_uid: 'my-uid', provider: 'ldapmain', ldap_email: true)
+      create(:omniauth_user, email: 'john@example.com', extern_uid: 'my-uid', provider: 'ldapmain', external_email: true, email_provider: 'ldapmain')
       expect(ldap_user.changed?).to be_falsey
     end
   end
@@ -141,8 +141,12 @@ describe Gitlab::LDAP::User, lib: true do
         expect(ldap_user.gl_user.email).to eq(info[:email])
       end
 
-      it "has ldap_email set to true" do
-        expect(ldap_user.gl_user.ldap_email?).to be(true)
+      it "has external_email set to true" do
+        expect(ldap_user.gl_user.external_email?).to be(true)
+      end
+
+      it "has email_provider set to provider" do
+        expect(ldap_user.gl_user.email_provider).to eql 'ldapmain'
       end
     end
 
@@ -155,8 +159,8 @@ describe Gitlab::LDAP::User, lib: true do
         expect(ldap_user.gl_user.temp_oauth_email?).to be(true)
       end
 
-      it "has ldap_email set to false" do
-        expect(ldap_user.gl_user.ldap_email?).to be(false)
+      it "has external_email set to false" do
+        expect(ldap_user.gl_user.external_email?).to be(false)
       end
     end
   end
diff --git a/spec/lib/gitlab/o_auth/user_spec.rb b/spec/lib/gitlab/o_auth/user_spec.rb
index 828c953197d..8943d1aa488 100644
--- a/spec/lib/gitlab/o_auth/user_spec.rb
+++ b/spec/lib/gitlab/o_auth/user_spec.rb
@@ -28,11 +28,11 @@ describe Gitlab::OAuth::User, lib: true do
     end
   end
 
-  describe '#save' do
-    def stub_omniauth_config(messages)
-      allow(Gitlab.config.omniauth).to receive_messages(messages)
-    end
+  def stub_omniauth_config(messages)
+    allow(Gitlab.config.omniauth).to receive_messages(messages)
+  end
 
+  describe '#save' do
     def stub_ldap_config(messages)
       allow(Gitlab::LDAP::Config).to receive_messages(messages)
     end
@@ -377,4 +377,40 @@ describe Gitlab::OAuth::User, lib: true do
       end
     end
   end
+
+  describe 'updating email' do
+    let!(:existing_user) { create(:omniauth_user, extern_uid: 'my-uid', provider: 'my-provider') }
+
+    before do
+      stub_omniauth_config(sync_email_from_provider: 'my-provider')
+    end
+
+    context "when provider sets an email" do
+      it "updates the user email" do
+        expect(gl_user.email).to eq(info_hash[:email])
+      end
+
+      it "has external_email set to true" do
+        expect(gl_user.external_email?).to be(true)
+      end
+
+      it "has email_provider set to provider" do
+        expect(gl_user.email_provider).to eql 'my-provider'
+      end
+    end
+
+    context "when provider doesn't set an email" do
+      before do
+        info_hash.delete(:email)
+      end
+
+      it "does not update the user email" do
+        expect(gl_user.email).not_to eq(info_hash[:email])
+      end
+
+      it "has external_email set to false" do
+        expect(gl_user.external_email?).to be(false)
+      end
+    end
+  end
 end
-- 
cgit v1.2.3


From 32cac597275706930b221b19fb20b29ccebc7130 Mon Sep 17 00:00:00 2001
From: "Luke \"Jared\" Bennett" <lbennett@gitlab.com>
Date: Wed, 7 Jun 2017 18:33:50 +0000
Subject: Added more actions and report as abuse to all notes

---
 spec/lib/gitlab/url_builder_spec.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/url_builder_spec.rb b/spec/lib/gitlab/url_builder_spec.rb
index 3fe8cf43934..e8a37e8d77b 100644
--- a/spec/lib/gitlab/url_builder_spec.rb
+++ b/spec/lib/gitlab/url_builder_spec.rb
@@ -97,6 +97,17 @@ describe Gitlab::UrlBuilder, lib: true do
         end
       end
 
+      context 'on a PersonalSnippet' do
+        it 'returns a proper URL' do
+          personal_snippet = create(:personal_snippet)
+          note = build_stubbed(:note_on_personal_snippet, noteable: personal_snippet)
+
+          url = described_class.build(note)
+
+          expect(url).to eq "#{Settings.gitlab['url']}/snippets/#{note.noteable_id}#note_#{note.id}"
+        end
+      end
+
       context 'on another object' do
         it 'returns a proper URL' do
           project = build_stubbed(:empty_project)
-- 
cgit v1.2.3


From cb5a5eb89265f7261ecc97b6de5bd26ca092960c Mon Sep 17 00:00:00 2001
From: Robin Bobbitt <ryehle@us.ibm.com>
Date: Wed, 7 Jun 2017 15:49:45 -0400
Subject: Instruct user to use a personal access token for Git over HTTP

If internal auth is disabled and LDAP is not configured on the instance,
present the user with a message to create a personal access token if his
Git over HTTP auth attempt fails.
---
 spec/lib/gitlab/auth_spec.rb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/auth_spec.rb b/spec/lib/gitlab/auth_spec.rb
index d6006eab0c9..d09da951869 100644
--- a/spec/lib/gitlab/auth_spec.rb
+++ b/spec/lib/gitlab/auth_spec.rb
@@ -204,6 +204,12 @@ describe Gitlab::Auth, lib: true do
       expect(gl_auth).to receive(:rate_limit!).with('ip', success: false, login: login)
       expect(gl_auth.find_for_git_client(login, 'bar', project: nil, ip: 'ip')).to eq(Gitlab::Auth::Result.new)
     end
+
+    it 'throws an error suggesting user create a PAT when internal auth is disabled' do
+      allow_any_instance_of(ApplicationSetting).to receive(:signin_enabled?) { false }
+
+      expect { gl_auth.find_for_git_client('foo', 'bar', project: nil, ip: 'ip') }.to raise_error(Gitlab::Auth::MissingPersonalTokenError)
+    end
   end
 
   describe 'find_with_user_password' do
-- 
cgit v1.2.3


From 1d1363e2bb8a0aee7e2849fd463ea415035710d9 Mon Sep 17 00:00:00 2001
From: DJ Mountney <david@twkie.net>
Date: Wed, 7 Jun 2017 20:32:38 -0700
Subject: Bring in security changes from the 9.2.5 release

Ran:
 - git format-patch v9.2.2..v9.2.5 --stdout > patchfile.patch
 - git checkout -b 9-2-5-security-patch origin/v9.2.2
 - git apply patchfile.patch
 - git commit
 - [Got the sha ref for the commit]
 - git checkout -b upstream-9-2-security master
 - git cherry-pick <SHA of the patchfile commit>
 - [Resolved conflicts]
 - git cherry-pick --continue
---
 spec/lib/gitlab/uploads_transfer_spec.rb | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 spec/lib/gitlab/uploads_transfer_spec.rb

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/uploads_transfer_spec.rb b/spec/lib/gitlab/uploads_transfer_spec.rb
new file mode 100644
index 00000000000..109559bb01c
--- /dev/null
+++ b/spec/lib/gitlab/uploads_transfer_spec.rb
@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Gitlab::UploadsTransfer do
+  it 'leaves avatar uploads where they are' do
+    project_with_avatar = create(:empty_project, :with_avatar)
+
+    described_class.new.rename_namespace('project', 'project-renamed')
+
+    expect(File.exist?(project_with_avatar.avatar.path)).to be_truthy
+  end
+end
-- 
cgit v1.2.3


From ffbbd4112eb5a0a927925e70644128bf25145414 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Tue, 6 Jun 2017 16:24:32 -0500
Subject: Move diffable? method from Repository to Diff::File

---
 .../file_collection/merge_request_diff_spec.rb     | 12 ++-----
 spec/lib/gitlab/diff/file_spec.rb                  | 28 +++++++++++++--
 spec/lib/gitlab/git/repository_spec.rb             | 41 ----------------------
 3 files changed, 27 insertions(+), 54 deletions(-)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/diff/file_collection/merge_request_diff_spec.rb b/spec/lib/gitlab/diff/file_collection/merge_request_diff_spec.rb
index f2bc15d39d7..d81774c8b8f 100644
--- a/spec/lib/gitlab/diff/file_collection/merge_request_diff_spec.rb
+++ b/spec/lib/gitlab/diff/file_collection/merge_request_diff_spec.rb
@@ -5,15 +5,7 @@ describe Gitlab::Diff::FileCollection::MergeRequestDiff do
   let(:diff_files) { described_class.new(merge_request.merge_request_diff, diff_options: nil).diff_files }
 
   it 'does not highlight binary files' do
-    allow_any_instance_of(Gitlab::Diff::File).to receive(:blob).and_return(double("text?" => false))
-
-    expect_any_instance_of(Gitlab::Diff::File).not_to receive(:highlighted_diff_lines)
-
-    diff_files
-  end
-
-  it 'does not highlight file if blob is not accessable' do
-    allow_any_instance_of(Gitlab::Diff::File).to receive(:blob).and_return(nil)
+    allow_any_instance_of(Gitlab::Diff::File).to receive(:text?).and_return(false)
 
     expect_any_instance_of(Gitlab::Diff::File).not_to receive(:highlighted_diff_lines)
 
@@ -21,7 +13,7 @@ describe Gitlab::Diff::FileCollection::MergeRequestDiff do
   end
 
   it 'does not files marked as undiffable in .gitattributes' do
-    allow_any_instance_of(Repository).to receive(:diffable?).and_return(false)
+    allow_any_instance_of(Gitlab::Diff::File).to receive(:diffable?).and_return(false)
 
     expect_any_instance_of(Gitlab::Diff::File).not_to receive(:highlighted_diff_lines)
 
diff --git a/spec/lib/gitlab/diff/file_spec.rb b/spec/lib/gitlab/diff/file_spec.rb
index 050689b7c9a..a9953bb0d01 100644
--- a/spec/lib/gitlab/diff/file_spec.rb
+++ b/spec/lib/gitlab/diff/file_spec.rb
@@ -6,7 +6,7 @@ describe Gitlab::Diff::File, lib: true do
   let(:project) { create(:project, :repository) }
   let(:commit) { project.commit(sample_commit.id) }
   let(:diff) { commit.raw_diffs.first }
-  let(:diff_file) { Gitlab::Diff::File.new(diff, diff_refs: commit.diff_refs, repository: project.repository) }
+  let(:diff_file) { described_class.new(diff, diff_refs: commit.diff_refs, repository: project.repository) }
 
   describe '#diff_lines' do
     let(:diff_lines) { diff_file.diff_lines }
@@ -63,11 +63,33 @@ describe Gitlab::Diff::File, lib: true do
     end
   end
 
-  describe '#blob' do
+  describe '#new_blob' do
     it 'returns blob of new commit' do
-      data = diff_file.blob.data
+      data = diff_file.new_blob.data
 
       expect(data).to include('raise RuntimeError, "System commands must be given as an array of strings"')
     end
   end
+
+  describe '#diffable?' do
+    let(:commit) { project.commit('1a0b36b3cdad1d2ee32457c102a8c0b7056fa863') }
+    let(:diffs) { commit.diffs }
+
+    before do
+      info_dir_path = File.join(project.repository.path_to_repo, 'info')
+
+      FileUtils.mkdir(info_dir_path) unless File.exist?(info_dir_path)
+      File.write(File.join(info_dir_path, 'attributes'), "*.md -diff\n")
+    end
+
+    it "returns true for files that do not have attributes" do
+      diff_file = diffs.diff_file_with_new_path('LICENSE')
+      expect(diff_file.diffable?).to be_truthy
+    end
+
+    it "returns false for files that have been marked as not being diffable in attributes" do
+      diff_file = diffs.diff_file_with_new_path('README.md')
+      expect(diff_file.diffable?).to be_falsey
+    end
+  end
 end
diff --git a/spec/lib/gitlab/git/repository_spec.rb b/spec/lib/gitlab/git/repository_spec.rb
index 26215381cc4..e1e4aa9fde9 100644
--- a/spec/lib/gitlab/git/repository_spec.rb
+++ b/spec/lib/gitlab/git/repository_spec.rb
@@ -1235,47 +1235,6 @@ describe Gitlab::Git::Repository, seed_helper: true do
     end
   end
 
-  describe '#diffable' do
-    info_dir_path = attributes_path = File.join(SEED_STORAGE_PATH, TEST_REPO_PATH, 'info')
-    attributes_path = File.join(info_dir_path, 'attributes')
-
-    before(:all) do
-      FileUtils.mkdir(info_dir_path) unless File.exist?(info_dir_path)
-      File.write(attributes_path, "*.md -diff\n")
-    end
-
-    it "should return true for files which are text and do not have attributes" do
-      blob = Gitlab::Git::Blob.find(
-        repository,
-        '33bcff41c232a11727ac6d660bd4b0c2ba86d63d',
-        'LICENSE'
-      )
-      expect(repository.diffable?(blob)).to be_truthy
-    end
-
-    it "should return false for binary files which do not have attributes" do
-      blob = Gitlab::Git::Blob.find(
-        repository,
-        '33bcff41c232a11727ac6d660bd4b0c2ba86d63d',
-        'files/images/logo-white.png'
-      )
-      expect(repository.diffable?(blob)).to be_falsey
-    end
-
-    it "should return false for text files which have been marked as not being diffable in attributes" do
-      blob = Gitlab::Git::Blob.find(
-        repository,
-        '33bcff41c232a11727ac6d660bd4b0c2ba86d63d',
-        'README.md'
-      )
-      expect(repository.diffable?(blob)).to be_falsey
-    end
-
-    after(:all) do
-      FileUtils.rm_rf(info_dir_path)
-    end
-  end
-
   describe '#tag_exists?' do
     it 'returns true for an existing tag' do
       tag = repository.tag_names.first
-- 
cgit v1.2.3


From e6e29f9220a676f86ad035ae6430888deab4e8c5 Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Tue, 6 Jun 2017 16:21:29 -0500
Subject: Use Diff::File blob methods from diff highlighter

---
 spec/lib/gitlab/highlight_spec.rb | 37 +++++++++++++------------------------
 1 file changed, 13 insertions(+), 24 deletions(-)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/highlight_spec.rb b/spec/lib/gitlab/highlight_spec.rb
index a20cef3b000..c2bb9f9a166 100644
--- a/spec/lib/gitlab/highlight_spec.rb
+++ b/spec/lib/gitlab/highlight_spec.rb
@@ -7,30 +7,6 @@ describe Gitlab::Highlight, lib: true do
   let(:repository) { project.repository }
   let(:commit) { project.commit(sample_commit.id) }
 
-  describe '.highlight_lines' do
-    let(:lines) do
-      Gitlab::Highlight.highlight_lines(project.repository, commit.id, 'files/ruby/popen.rb')
-    end
-
-    it 'highlights all the lines properly' do
-      expect(lines[4]).to eq(%Q{<span id="LC5" class="line" lang="ruby">  <span class="kp">extend</span> <span class="nb">self</span></span>\n})
-      expect(lines[21]).to eq(%Q{<span id="LC22" class="line" lang="ruby">    <span class="k">unless</span> <span class="no">File</span><span class="p">.</span><span class="nf">directory?</span><span class="p">(</span><span class="n">path</span><span class="p">)</span></span>\n})
-      expect(lines[26]).to eq(%Q{<span id="LC27" class="line" lang="ruby">    <span class="vi">@cmd_status</span> <span class="o">=</span> <span class="mi">0</span></span>\n})
-    end
-
-    describe 'with CRLF' do
-      let(:branch) { 'crlf-diff' }
-      let(:blob) { repository.blob_at_branch(branch, path) }
-      let(:lines) do
-        Gitlab::Highlight.highlight_lines(project.repository, 'crlf-diff', 'files/whitespace')
-      end
-
-      it 'strips extra LFs' do
-        expect(lines[0]).to eq("<span id=\"LC1\" class=\"line\" lang=\"plaintext\">test  </span>")
-      end
-    end
-  end
-
   describe 'custom highlighting from .gitattributes' do
     let(:branch) { 'gitattributes' }
     let(:blob) { repository.blob_at_branch(branch, path) }
@@ -59,6 +35,19 @@ describe Gitlab::Highlight, lib: true do
   end
 
   describe '#highlight' do
+    describe 'with CRLF' do
+      let(:branch) { 'crlf-diff' }
+      let(:path) { 'files/whitespace' }
+      let(:blob) { repository.blob_at_branch(branch, path) }
+      let(:lines) do
+        Gitlab::Highlight.highlight(blob.path, blob.data, repository: repository).lines
+      end
+
+      it 'strips extra LFs' do
+        expect(lines[0]).to eq("<span id=\"LC1\" class=\"line\" lang=\"plaintext\">test  </span>")
+      end
+    end
+
     it 'links dependencies via DependencyLinker' do
       expect(Gitlab::DependencyLinker).to receive(:link).
         with('file.name', 'Contents', anything).and_call_original
-- 
cgit v1.2.3


From 8c6e2bada222745c9994da42f21bad2ab43b9351 Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Sat, 14 Jan 2017 14:39:53 -0500
Subject: Add support for docker image configuration in .gitlab-ci.yml

---
 spec/lib/gitlab/ci/config/entry/global_spec.rb   |  12 +--
 spec/lib/gitlab/ci/config/entry/image_spec.rb    | 113 +++++++++++++++++-----
 spec/lib/gitlab/ci/config/entry/job_spec.rb      |   2 +-
 spec/lib/gitlab/ci/config/entry/service_spec.rb  | 117 +++++++++++++++++++++++
 spec/lib/gitlab/ci/config/entry/services_spec.rb |  41 ++++----
 5 files changed, 228 insertions(+), 57 deletions(-)
 create mode 100644 spec/lib/gitlab/ci/config/entry/service_spec.rb

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/ci/config/entry/global_spec.rb b/spec/lib/gitlab/ci/config/entry/global_spec.rb
index 23270ad5053..e5f85c712ca 100644
--- a/spec/lib/gitlab/ci/config/entry/global_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/global_spec.rb
@@ -95,13 +95,13 @@ describe Gitlab::Ci::Config::Entry::Global do
 
         describe '#image_value' do
           it 'returns valid image' do
-            expect(global.image_value).to eq 'ruby:2.2'
+            expect(global.image_value).to eq(name: 'ruby:2.2')
           end
         end
 
         describe '#services_value' do
           it 'returns array of services' do
-            expect(global.services_value).to eq ['postgres:9.1', 'mysql:5.5']
+            expect(global.services_value).to eq [{ name: 'postgres:9.1' }, { name: 'mysql:5.5' }]
           end
         end
 
@@ -150,8 +150,8 @@ describe Gitlab::Ci::Config::Entry::Global do
                        script: %w[rspec ls],
                        before_script: %w(ls pwd),
                        commands: "ls\npwd\nrspec\nls",
-                       image: 'ruby:2.2',
-                       services: ['postgres:9.1', 'mysql:5.5'],
+                       image: { name: 'ruby:2.2' },
+                       services: [{ name: 'postgres:9.1' }, { name: 'mysql:5.5' }],
                        stage: 'test',
                        cache: { key: 'k', untracked: true, paths: ['public/'] },
                        variables: { 'VAR' => 'value' },
@@ -161,8 +161,8 @@ describe Gitlab::Ci::Config::Entry::Global do
                          before_script: [],
                          script: %w[spinach],
                          commands: 'spinach',
-                         image: 'ruby:2.2',
-                         services: ['postgres:9.1', 'mysql:5.5'],
+                         image: { name: 'ruby:2.2' },
+                         services: [{ name: 'postgres:9.1' }, { name: 'mysql:5.5' }],
                          stage: 'test',
                          cache: { key: 'k', untracked: true, paths: ['public/'] },
                          variables: {},
diff --git a/spec/lib/gitlab/ci/config/entry/image_spec.rb b/spec/lib/gitlab/ci/config/entry/image_spec.rb
index 3c99cb0a1ee..bca22e39500 100644
--- a/spec/lib/gitlab/ci/config/entry/image_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/image_spec.rb
@@ -3,43 +3,104 @@ require 'spec_helper'
 describe Gitlab::Ci::Config::Entry::Image do
   let(:entry) { described_class.new(config) }
 
-  describe 'validation' do
-    context 'when entry config value is correct' do
-      let(:config) { 'ruby:2.2' }
+  context 'when configuration is a string' do
+    let(:config) { 'ruby:2.2' }
 
-      describe '#value' do
-        it 'returns image string' do
-          expect(entry.value).to eq 'ruby:2.2'
-        end
+    describe '#value' do
+      it 'returns image hash' do
+        expect(entry.value).to eq({ name: 'ruby:2.2' })
       end
+    end
+
+    describe '#errors' do
+      it 'does not append errors' do
+        expect(entry.errors).to be_empty
+      end
+    end
+
+    describe '#valid?' do
+      it 'is valid' do
+        expect(entry).to be_valid
+      end
+    end
+
+    describe '#image' do
+      it "returns image's name" do
+        expect(entry.name).to eq 'ruby:2.2'
+      end
+    end
 
-      describe '#errors' do
-        it 'does not append errors' do
-          expect(entry.errors).to be_empty
-        end
+    describe '#entrypoint' do
+      it "returns image's entrypoint" do
+        expect(entry.entrypoint).to be_nil
       end
+    end
+  end
 
-      describe '#valid?' do
-        it 'is valid' do
-          expect(entry).to be_valid
-        end
+  context 'when configuration is a hash' do
+    let(:config) { { name: 'ruby:2.2', entrypoint: '/bin/sh' } }
+
+    describe '#value' do
+      it 'returns image hash' do
+        expect(entry.value).to eq(config)
       end
     end
 
-    context 'when entry value is not correct' do
-      let(:config) { ['ruby:2.2'] }
+    describe '#errors' do
+      it 'does not append errors' do
+        expect(entry.errors).to be_empty
+      end
+    end
+
+    describe '#valid?' do
+      it 'is valid' do
+        expect(entry).to be_valid
+      end
+    end
 
-      describe '#errors' do
-        it 'saves errors' do
-          expect(entry.errors)
-            .to include 'image config should be a string'
-        end
+    describe '#image' do
+      it "returns image's name" do
+        expect(entry.name).to eq 'ruby:2.2'
       end
+    end
+
+    describe '#entrypoint' do
+      it "returns image's entrypoint" do
+        expect(entry.entrypoint).to eq '/bin/sh'
+      end
+    end
+  end
+
+  context 'when entry value is not correct' do
+    let(:config) { ['ruby:2.2'] }
+
+    describe '#errors' do
+      it 'saves errors' do
+        expect(entry.errors)
+          .to include 'image config should be a hash or a string'
+      end
+    end
+
+    describe '#valid?' do
+      it 'is not valid' do
+        expect(entry).not_to be_valid
+      end
+    end
+  end
+
+  context 'when unexpected key is specified' do
+    let(:config) { { name: 'ruby:2.2', non_existing: 'test' } }
+
+    describe '#errors' do
+      it 'saves errors' do
+        expect(entry.errors)
+            .to include 'image config contains unknown keys: non_existing'
+      end
+    end
 
-      describe '#valid?' do
-        it 'is not valid' do
-          expect(entry).not_to be_valid
-        end
+    describe '#valid?' do
+      it 'is not valid' do
+        expect(entry).not_to be_valid
       end
     end
   end
diff --git a/spec/lib/gitlab/ci/config/entry/job_spec.rb b/spec/lib/gitlab/ci/config/entry/job_spec.rb
index 9249bb9c172..8dc94a4eb33 100644
--- a/spec/lib/gitlab/ci/config/entry/job_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/job_spec.rb
@@ -104,7 +104,7 @@ describe Gitlab::Ci::Config::Entry::Job do
       end
 
       it 'overrides global config' do
-        expect(entry[:image].value).to eq 'some_image'
+        expect(entry[:image].value).to eq(name: 'some_image')
         expect(entry[:cache].value).to eq(key: 'test')
       end
     end
diff --git a/spec/lib/gitlab/ci/config/entry/service_spec.rb b/spec/lib/gitlab/ci/config/entry/service_spec.rb
new file mode 100644
index 00000000000..2376de74554
--- /dev/null
+++ b/spec/lib/gitlab/ci/config/entry/service_spec.rb
@@ -0,0 +1,117 @@
+require 'spec_helper'
+
+describe Gitlab::Ci::Config::Entry::Service do
+  let(:entry) { described_class.new(config) }
+
+  before { entry.compose! }
+
+  context 'when configuration is a string' do
+    let(:config) { 'postgresql:9.5' }
+
+    describe '#valid?' do
+      it 'is valid' do
+        expect(entry).to be_valid
+      end
+    end
+
+    describe '#value' do
+      it 'returns valid hash' do
+        expect(entry.value).to include(name: 'postgresql:9.5')
+      end
+    end
+
+    describe '#image' do
+      it "returns service's image name" do
+        expect(entry.name).to eq 'postgresql:9.5'
+      end
+    end
+
+    describe '#alias' do
+      it "returns service's alias" do
+        expect(entry.alias).to be_nil
+      end
+    end
+
+    describe '#command' do
+      it "returns service's command" do
+        expect(entry.command).to be_nil
+      end
+    end
+  end
+
+  context 'when configuration is a hash' do
+    let(:config) do
+      { name: 'postgresql:9.5', alias: 'db', command: 'cmd', entrypoint: '/bin/sh' }
+    end
+
+    describe '#valid?' do
+      it 'is valid' do
+        expect(entry).to be_valid
+      end
+    end
+
+    describe '#value' do
+      it 'returns valid hash' do
+        expect(entry.value).to eq config
+      end
+    end
+
+    describe '#image' do
+      it "returns service's image name" do
+        expect(entry.name).to eq 'postgresql:9.5'
+      end
+    end
+
+    describe '#alias' do
+      it "returns service's alias" do
+        expect(entry.alias).to eq 'db'
+      end
+    end
+
+    describe '#command' do
+      it "returns service's command" do
+        expect(entry.command).to eq 'cmd'
+      end
+    end
+
+    describe '#entrypoint' do
+      it "returns service's entrypoint" do
+        expect(entry.entrypoint).to eq '/bin/sh'
+      end
+    end
+  end
+
+  context 'when entry value is not correct' do
+    let(:config) { ['postgresql:9.5'] }
+
+    describe '#errors' do
+      it 'saves errors' do
+        expect(entry.errors)
+            .to include 'service config should be a hash or a string'
+      end
+    end
+
+    describe '#valid?' do
+      it 'is not valid' do
+        expect(entry).not_to be_valid
+      end
+    end
+  end
+
+  context 'when unexpected key is specified' do
+    let(:config) { { name: 'postgresql:9.5', non_existing: 'test' } }
+
+    describe '#errors' do
+      it 'saves errors' do
+        expect(entry.errors)
+            .to include 'service config contains unknown keys: non_existing'
+      end
+    end
+
+    describe '#valid?' do
+      it 'is not valid' do
+        expect(entry).not_to be_valid
+      end
+    end
+  end
+end
diff --git a/spec/lib/gitlab/ci/config/entry/services_spec.rb b/spec/lib/gitlab/ci/config/entry/services_spec.rb
index 66fad3b6b16..b32e52f8f26 100644
--- a/spec/lib/gitlab/ci/config/entry/services_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/services_spec.rb
@@ -3,37 +3,30 @@ require 'spec_helper'
 describe Gitlab::Ci::Config::Entry::Services do
   let(:entry) { described_class.new(config) }
 
-  describe 'validations' do
-    context 'when entry config value is correct' do
-      let(:config) { ['postgres:9.1', 'mysql:5.5'] }
+  before { entry.compose! }
 
-      describe '#value' do
-        it 'returns array of services as is' do
-          expect(entry.value).to eq config
-        end
-      end
+  context 'when configuration is valid' do
+    let(:config) { ['postgresql:9.5', { name: 'postgresql:9.1', alias: 'postgres_old' }] }
 
-      describe '#valid?' do
-        it 'is valid' do
-          expect(entry).to be_valid
-        end
+    describe '#valid?' do
+      it 'is valid' do
+        expect(entry).to be_valid
       end
     end
 
-    context 'when entry value is not correct' do
-      let(:config) { 'ls' }
-
-      describe '#errors' do
-        it 'saves errors' do
-          expect(entry.errors)
-            .to include 'services config should be an array of strings'
-        end
+    describe '#value' do
+      it 'returns valid array' do
+        expect(entry.value).to eq([{ name: 'postgresql:9.5' }, { name: 'postgresql:9.1', alias: 'postgres_old' }])
       end
+    end
+  end
+
+  context 'when configuration is invalid' do
+    let(:config) { 'postgresql:9.5' }
 
-      describe '#valid?' do
-        it 'is not valid' do
-          expect(entry).not_to be_valid
-        end
+    describe '#valid?' do
+      it 'is invalid' do
+        expect(entry).not_to be_valid
       end
     end
   end
-- 
cgit v1.2.3


From c70e9f2ed107ac3d0189a803eae6e7e7917f6224 Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Mon, 5 Jun 2017 16:15:09 +0200
Subject: Send new configuration options with job's payload

---
 spec/lib/gitlab/ci/build/image_spec.rb | 61 +++++++++++++++++++++++++++++-----
 1 file changed, 53 insertions(+), 8 deletions(-)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/ci/build/image_spec.rb b/spec/lib/gitlab/ci/build/image_spec.rb
index 382385dfd6b..773a52cdfbc 100644
--- a/spec/lib/gitlab/ci/build/image_spec.rb
+++ b/spec/lib/gitlab/ci/build/image_spec.rb
@@ -10,12 +10,28 @@ describe Gitlab::Ci::Build::Image do
       let(:image_name) { 'ruby:2.1' }
       let(:job) { create(:ci_build, options: { image: image_name } ) }
 
-      it 'fabricates an object of the proper class' do
-        is_expected.to be_kind_of(described_class)
+      context 'when image is defined as string' do
+        it 'fabricates an object of the proper class' do
+          is_expected.to be_kind_of(described_class)
+        end
+
+        it 'populates fabricated object with the proper name attribute' do
+          expect(subject.name).to eq(image_name)
+        end
       end
 
-      it 'populates fabricated object with the proper name attribute' do
-        expect(subject.name).to eq(image_name)
+      context 'when image is defined as hash' do
+        let(:entrypoint) { '/bin/sh' }
+        let(:job) { create(:ci_build, options: { image: { name: image_name, entrypoint: entrypoint } } ) }
+
+        it 'fabricates an object of the proper class' do
+          is_expected.to be_kind_of(described_class)
+        end
+
+        it 'populates fabricated object with the proper attributes' do
+          expect(subject.name).to eq(image_name)
+          expect(subject.entrypoint).to eq(entrypoint)
+        end
       end
 
       context 'when image name is empty' do
@@ -41,10 +57,39 @@ describe Gitlab::Ci::Build::Image do
       let(:service_image_name) { 'postgres' }
       let(:job) { create(:ci_build, options: { services: [service_image_name] }) }
 
-      it 'fabricates an non-empty array of objects' do
-        is_expected.to be_kind_of(Array)
-        is_expected.not_to be_empty
-        expect(subject.first.name).to eq(service_image_name)
+      context 'when service is defined as string' do
+        it 'fabricates an non-empty array of objects' do
+          is_expected.to be_kind_of(Array)
+          is_expected.not_to be_empty
+        end
+
+        it 'populates fabricated objects with the proper name attributes' do
+          expect(subject.first).to be_kind_of(described_class)
+          expect(subject.first.name).to eq(service_image_name)
+        end
+      end
+
+      context 'when service is defined as hash' do
+        let(:service_entrypoint) { '/bin/sh' }
+        let(:service_alias) { 'db' }
+        let(:service_command) { 'sleep 30' }
+        let(:job) do
+          create(:ci_build, options: { services: [{ name: service_image_name, entrypoint: service_entrypoint,
+                                                    alias: service_alias, command: service_command }] })
+        end
+
+        it 'fabricates an non-empty array of objects' do
+          is_expected.to be_kind_of(Array)
+          is_expected.not_to be_empty
+          expect(subject.first).to be_kind_of(described_class)
+        end
+
+        it 'populates fabricated objects with the proper attributes' do
+          expect(subject.first.name).to eq(service_image_name)
+          expect(subject.first.entrypoint).to eq(service_entrypoint)
+          expect(subject.first.alias).to eq(service_alias)
+          expect(subject.first.command).to eq(service_command)
+        end
       end
 
       context 'when service image name is empty' do
-- 
cgit v1.2.3


From d83ee2bbd10d8fe2f2e9521bb3c266cf696aa98c Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Fri, 2 Jun 2017 17:12:36 +0200
Subject: Add the ability to perform background migrations

Background migrations can be used to perform long running data
migrations without these blocking a deployment procedure.

See MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11854 for
more information.
---
 spec/lib/gitlab/background_migration_spec.rb | 48 ++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 spec/lib/gitlab/background_migration_spec.rb

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/background_migration_spec.rb b/spec/lib/gitlab/background_migration_spec.rb
new file mode 100644
index 00000000000..f2073b9bcb3
--- /dev/null
+++ b/spec/lib/gitlab/background_migration_spec.rb
@@ -0,0 +1,48 @@
+require 'spec_helper'
+
+describe Gitlab::BackgroundMigration do
+  describe '.steal' do
+    it 'steals jobs from a queue' do
+      queue = [double(:job, args: ['Foo', [10, 20]])]
+
+      allow(Sidekiq::Queue).to receive(:new).
+        with(BackgroundMigrationWorker.sidekiq_options['queue']).
+        and_return(queue)
+
+      expect(queue[0]).to receive(:delete)
+
+      expect(described_class).to receive(:perform).with('Foo', [10, 20])
+
+      described_class.steal('Foo')
+    end
+
+    it 'does not steal jobs for a different migration' do
+      queue = [double(:job, args: ['Foo', [10, 20]])]
+
+      allow(Sidekiq::Queue).to receive(:new).
+        with(BackgroundMigrationWorker.sidekiq_options['queue']).
+        and_return(queue)
+
+      expect(described_class).not_to receive(:perform)
+
+      expect(queue[0]).not_to receive(:delete)
+
+      described_class.steal('Bar')
+    end
+  end
+
+  describe '.perform' do
+    it 'performs a background migration' do
+      instance = double(:instance)
+      klass = double(:klass, new: instance)
+
+      expect(described_class).to receive(:const_get).
+        with('Foo').
+        and_return(klass)
+
+      expect(instance).to receive(:perform).with(10, 20)
+
+      described_class.perform('Foo', [10, 20])
+    end
+  end
+end
-- 
cgit v1.2.3


From cd1a85427ab828e7224f95ee931a8ed3f3886962 Mon Sep 17 00:00:00 2001
From: "Z.J. van de Weg" <git@zjvandeweg.nl>
Date: Mon, 12 Jun 2017 14:29:54 +0200
Subject: Revert to passing the path when matching key to the router

This was edited to the request, but this won't work if the data is not
available at the time of setting the key for the first time.
---
 spec/lib/gitlab/etag_caching/middleware_spec.rb | 33 +++++++++----------
 spec/lib/gitlab/etag_caching/router_spec.rb     | 44 ++++++-------------------
 2 files changed, 25 insertions(+), 52 deletions(-)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/etag_caching/middleware_spec.rb b/spec/lib/gitlab/etag_caching/middleware_spec.rb
index 3c6ef7c7ccb..4acf4f047f1 100644
--- a/spec/lib/gitlab/etag_caching/middleware_spec.rb
+++ b/spec/lib/gitlab/etag_caching/middleware_spec.rb
@@ -15,13 +15,13 @@ describe Gitlab::EtagCaching::Middleware do
     end
 
     it 'does not add ETag header' do
-      _, headers, _ = middleware.call(build_env(path, if_none_match))
+      _, headers, _ = middleware.call(build_request(path, if_none_match))
 
       expect(headers['ETag']).to be_nil
     end
 
     it 'passes status code from app' do
-      status, _, _ = middleware.call(build_env(path, if_none_match))
+      status, _, _ = middleware.call(build_request(path, if_none_match))
 
       expect(status).to eq app_status_code
     end
@@ -39,7 +39,7 @@ describe Gitlab::EtagCaching::Middleware do
       expect_any_instance_of(Gitlab::EtagCaching::Store)
         .to receive(:touch).and_return('123')
 
-      middleware.call(build_env(path, if_none_match))
+      middleware.call(build_request(path, if_none_match))
     end
 
     context 'when If-None-Match header was specified' do
@@ -51,7 +51,7 @@ describe Gitlab::EtagCaching::Middleware do
         expect(Gitlab::Metrics).to receive(:add_event)
           .with(:etag_caching_key_not_found, endpoint: 'issue_notes')
 
-        middleware.call(build_env(path, if_none_match))
+        middleware.call(build_request(path, if_none_match))
       end
     end
   end
@@ -65,7 +65,7 @@ describe Gitlab::EtagCaching::Middleware do
     end
 
     it 'returns this value as header' do
-      _, headers, _ = middleware.call(build_env(path, if_none_match))
+      _, headers, _ = middleware.call(build_request(path, if_none_match))
 
       expect(headers['ETag']).to eq 'W/"123"'
     end
@@ -82,17 +82,17 @@ describe Gitlab::EtagCaching::Middleware do
     it 'does not call app' do
       expect(app).not_to receive(:call)
 
-      middleware.call(build_env(path, if_none_match))
+      middleware.call(build_request(path, if_none_match))
     end
 
     it 'returns status code 304' do
-      status, _, _ = middleware.call(build_env(path, if_none_match))
+      status, _, _ = middleware.call(build_request(path, if_none_match))
 
       expect(status).to eq 304
     end
 
     it 'returns empty body' do
-      _, _, body = middleware.call(build_env(path, if_none_match))
+      _, _, body = middleware.call(build_request(path, if_none_match))
 
       expect(body).to be_empty
     end
@@ -103,7 +103,7 @@ describe Gitlab::EtagCaching::Middleware do
       expect(Gitlab::Metrics).to receive(:add_event)
         .with(:etag_caching_cache_hit, endpoint: 'issue_notes')
 
-      middleware.call(build_env(path, if_none_match))
+      middleware.call(build_request(path, if_none_match))
     end
 
     context 'when polling is disabled' do
@@ -113,7 +113,7 @@ describe Gitlab::EtagCaching::Middleware do
       end
 
       it 'returns status code 429' do
-        status, _, _ = middleware.call(build_env(path, if_none_match))
+        status, _, _ = middleware.call(build_request(path, if_none_match))
 
         expect(status).to eq 429
       end
@@ -131,7 +131,7 @@ describe Gitlab::EtagCaching::Middleware do
     it 'calls app' do
       expect(app).to receive(:call).and_return([app_status_code, {}, ['body']])
 
-      middleware.call(build_env(path, if_none_match))
+      middleware.call(build_request(path, if_none_match))
     end
 
     it 'tracks "etag_caching_resource_changed" event' do
@@ -142,7 +142,7 @@ describe Gitlab::EtagCaching::Middleware do
       expect(Gitlab::Metrics).to receive(:add_event)
         .with(:etag_caching_resource_changed, endpoint: 'issue_notes')
 
-      middleware.call(build_env(path, if_none_match))
+      middleware.call(build_request(path, if_none_match))
     end
   end
 
@@ -160,7 +160,7 @@ describe Gitlab::EtagCaching::Middleware do
       expect(Gitlab::Metrics).to receive(:add_event)
         .with(:etag_caching_header_missing, endpoint: 'issue_notes')
 
-      middleware.call(build_env(path, if_none_match))
+      middleware.call(build_request(path, if_none_match))
     end
   end
 
@@ -192,10 +192,7 @@ describe Gitlab::EtagCaching::Middleware do
       .to receive(:get).and_return(value)
   end
 
-  def build_env(path, if_none_match)
-    {
-      'PATH_INFO' => path,
-      'HTTP_IF_NONE_MATCH' => if_none_match
-    }
+  def build_request(path, if_none_match)
+    { 'PATH_INFO' => path, 'HTTP_IF_NONE_MATCH' => if_none_match }
   end
 end
diff --git a/spec/lib/gitlab/etag_caching/router_spec.rb b/spec/lib/gitlab/etag_caching/router_spec.rb
index 2bb40827fcf..f69cb502ca6 100644
--- a/spec/lib/gitlab/etag_caching/router_spec.rb
+++ b/spec/lib/gitlab/etag_caching/router_spec.rb
@@ -2,115 +2,91 @@ require 'spec_helper'
 
 describe Gitlab::EtagCaching::Router do
   it 'matches issue notes endpoint' do
-    request = build_request(
+    result = described_class.match(
       '/my-group/and-subgroup/here-comes-the-project/noteable/issue/1/notes'
     )
 
-    result = described_class.match(request)
-
     expect(result).to be_present
     expect(result.name).to eq 'issue_notes'
   end
 
   it 'matches issue title endpoint' do
-    request = build_request(
+    result = described_class.match(
       '/my-group/my-project/issues/123/realtime_changes'
     )
 
-    result = described_class.match(request)
-
     expect(result).to be_present
     expect(result.name).to eq 'issue_title'
   end
 
   it 'matches project pipelines endpoint' do
-    request = build_request(
+    result = described_class.match(
       '/my-group/my-project/pipelines.json'
     )
 
-    result = described_class.match(request)
-
     expect(result).to be_present
     expect(result.name).to eq 'project_pipelines'
   end
 
   it 'matches commit pipelines endpoint' do
-    request = build_request(
+    result = described_class.match(
       '/my-group/my-project/commit/aa8260d253a53f73f6c26c734c72fdd600f6e6d4/pipelines.json'
     )
 
-    result = described_class.match(request)
-
     expect(result).to be_present
     expect(result.name).to eq 'commit_pipelines'
   end
 
   it 'matches new merge request pipelines endpoint' do
-    request = build_request(
+    result = described_class.match(
       '/my-group/my-project/merge_requests/new.json'
     )
 
-    result = described_class.match(request)
-
     expect(result).to be_present
     expect(result.name).to eq 'new_merge_request_pipelines'
   end
 
   it 'matches merge request pipelines endpoint' do
-    request = build_request(
+    result = described_class.match(
       '/my-group/my-project/merge_requests/234/pipelines.json'
     )
 
-    result = described_class.match(request)
-
     expect(result).to be_present
     expect(result.name).to eq 'merge_request_pipelines'
   end
 
   it 'matches build endpoint' do
-    request = build_request(
+    result = described_class.match(
       '/my-group/my-project/builds/234.json'
     )
 
-    result = described_class.match(request)
-
     expect(result).to be_present
     expect(result.name).to eq 'project_build'
   end
 
   it 'does not match blob with confusing name' do
-    request = build_request(
+    result = described_class.match(
       '/my-group/my-project/blob/master/pipelines.json'
     )
 
-    result = described_class.match(request)
-
     expect(result).to be_blank
   end
 
   it 'matches the environments path' do
-    request = build_request(
+    result = described_class.match(
       '/my-group/my-project/environments.json'
     )
 
-    result = described_class.match(request)
     expect(result).to be_present
-
     expect(result.name).to eq 'environments'
   end
 
   it 'matches pipeline#show endpoint' do
-    request = build_request(
+    result = described_class.match(
       '/my-group/my-project/pipelines/2.json'
     )
 
-    result = described_class.match(request)
-
     expect(result).to be_present
     expect(result.name).to eq 'project_pipeline'
   end
-
-  def build_request(path)
-    double(path_info: path)
-  end
 end
-- 
cgit v1.2.3


From bc00806a4eec785068671f2c995febe01682c2d0 Mon Sep 17 00:00:00 2001
From: blackst0ne <blackst0ne.ru@gmail.com>
Date: Tue, 13 Jun 2017 22:44:13 +1100
Subject: Add database helpers 'add_timestamps_with_timezone' and
 'timestamps_with_timezone'

---
 spec/lib/gitlab/database/migration_helpers_spec.rb | 37 +++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/database/migration_helpers_spec.rb b/spec/lib/gitlab/database/migration_helpers_spec.rb
index 3fdafd867da..30aa463faf8 100644
--- a/spec/lib/gitlab/database/migration_helpers_spec.rb
+++ b/spec/lib/gitlab/database/migration_helpers_spec.rb
@@ -7,7 +7,42 @@ describe Gitlab::Database::MigrationHelpers, lib: true do
     )
   end
 
-  before { allow(model).to receive(:puts) }
+  before do
+    allow(model).to receive(:puts)
+  end
+
+  describe '#add_timestamps_with_timezone' do
+    before do
+      allow(model).to receive(:transaction_open?).and_return(false)
+    end
+
+    context 'using PostgreSQL' do
+      before do
+        allow(Gitlab::Database).to receive(:postgresql?).and_return(true)
+        allow(model).to receive(:disable_statement_timeout)
+      end
+
+      it 'adds "created_at" and "updated_at" fields with the "datetime_with_timezone" data type' do
+        expect(model).to receive(:add_column).with(:foo, :created_at, :datetime_with_timezone, { null: false })
+        expect(model).to receive(:add_column).with(:foo, :updated_at, :datetime_with_timezone, { null: false })
+
+        model.add_timestamps_with_timezone(:foo)
+      end
+    end
+
+    context 'using MySQL' do
+      before do
+        allow(Gitlab::Database).to receive(:postgresql?).and_return(false)
+      end
+
+      it 'adds "created_at" and "updated_at" fields with "datetime_with_timezone" data type' do
+        expect(model).to receive(:add_column).with(:foo, :created_at, :datetime_with_timezone, { null: false })
+        expect(model).to receive(:add_column).with(:foo, :updated_at, :datetime_with_timezone, { null: false })
+
+        model.add_timestamps_with_timezone(:foo)
+      end
+    end
+  end
 
   describe '#add_concurrent_index' do
     context 'outside a transaction' do
-- 
cgit v1.2.3


From 25b99a5b3beecb7251fef9097c44afd1f82f9f57 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 7 Jun 2017 12:32:16 +0200
Subject: Update tests and application

---
 spec/lib/gitlab/ci/status/external/common_spec.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/ci/status/external/common_spec.rb b/spec/lib/gitlab/ci/status/external/common_spec.rb
index 5a97d98b55f..e58f5d8d4df 100644
--- a/spec/lib/gitlab/ci/status/external/common_spec.rb
+++ b/spec/lib/gitlab/ci/status/external/common_spec.rb
@@ -4,9 +4,10 @@ describe Gitlab::Ci::Status::External::Common do
   let(:user) { create(:user) }
   let(:project) { external_status.project }
   let(:external_target_url) { 'http://example.gitlab.com/status' }
+  let(:external_description) { 'my description' }
 
   let(:external_status) do
-    create(:generic_commit_status, target_url: external_target_url)
+    create(:generic_commit_status, target_url: external_target_url, description: external_description)
   end
 
   subject do
@@ -15,6 +16,12 @@ describe Gitlab::Ci::Status::External::Common do
       .extend(described_class)
   end
 
+  describe '#label' do
+    it 'returns description' do
+      expect(subject.label).to eq external_description
+    end
+  end
+
   describe '#has_action?' do
     it { is_expected.not_to have_action }
   end
-- 
cgit v1.2.3


From fc6e3515a6a80788053ea943cb43eae2cadda21f Mon Sep 17 00:00:00 2001
From: Nick Thomas <nick@gitlab.com>
Date: Tue, 13 Jun 2017 16:31:23 +0100
Subject: Backport EE changes to the Kubernetes service

---
 spec/lib/gitlab/kubernetes_spec.rb | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/kubernetes_spec.rb b/spec/lib/gitlab/kubernetes_spec.rb
index 91f9d06b85a..e8c599a95ee 100644
--- a/spec/lib/gitlab/kubernetes_spec.rb
+++ b/spec/lib/gitlab/kubernetes_spec.rb
@@ -1,6 +1,7 @@
 require 'spec_helper'
 
 describe Gitlab::Kubernetes do
+  include KubernetesHelpers
   include described_class
 
   describe '#container_exec_url' do
@@ -36,4 +37,13 @@ describe Gitlab::Kubernetes do
       it { expect(result.query).to match(/\Acontainer=container\+1&/) }
     end
   end
+
+  describe '#filter_by_label' do
+    it 'returns matching labels' do
+      matching_items = [kube_pod(app: 'foo')]
+      items = matching_items + [kube_pod]
+
+      expect(filter_by_label(items, app: 'foo')).to eq(matching_items)
+    end
+  end
 end
-- 
cgit v1.2.3


From 794425456322864f37dbd862aca9bc6b6447591a Mon Sep 17 00:00:00 2001
From: Douwe Maan <douwe@selenight.nl>
Date: Tue, 6 Jun 2017 16:28:06 -0500
Subject: Implement diff viewers

---
 spec/lib/gitlab/diff/file_spec.rb | 301 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 301 insertions(+)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/diff/file_spec.rb b/spec/lib/gitlab/diff/file_spec.rb
index a9953bb0d01..f289131cc3a 100644
--- a/spec/lib/gitlab/diff/file_spec.rb
+++ b/spec/lib/gitlab/diff/file_spec.rb
@@ -92,4 +92,305 @@ describe Gitlab::Diff::File, lib: true do
       expect(diff_file.diffable?).to be_falsey
     end
   end
+
+  describe '#content_changed?' do
+    context 'when created' do
+      let(:commit) { project.commit('33f3729a45c02fc67d00adb1b8bca394b0e761d9') }
+      let(:diff_file) { commit.diffs.diff_file_with_new_path('files/images/6049019_460s.jpg') }
+
+      it 'returns false' do
+        expect(diff_file.content_changed?).to be_falsey
+      end
+    end
+
+    context 'when deleted' do
+      let(:commit) { project.commit('d59c60028b053793cecfb4022de34602e1a9218e') }
+      let(:diff_file) { commit.diffs.diff_file_with_old_path('files/js/commit.js.coffee') }
+
+      it 'returns false' do
+        expect(diff_file.content_changed?).to be_falsey
+      end
+    end
+
+    context 'when renamed' do
+      let(:commit) { project.commit('6907208d755b60ebeacb2e9dfea74c92c3449a1f') }
+      let(:diff_file) { commit.diffs.diff_file_with_new_path('files/js/commit.coffee') }
+
+      before do
+        allow(diff_file.new_blob).to receive(:id).and_return(diff_file.old_blob.id)
+      end
+
+      it 'returns false' do
+        expect(diff_file.content_changed?).to be_falsey
+      end
+    end
+
+    context 'when content changed' do
+      context 'when binary' do
+        let(:commit) { project.commit('2f63565e7aac07bcdadb654e253078b727143ec4') }
+        let(:diff_file) { commit.diffs.diff_file_with_new_path('files/images/6049019_460s.jpg') }
+
+        it 'returns true' do
+          expect(diff_file.content_changed?).to be_truthy
+        end
+      end
+
+      context 'when not binary' do
+        let(:commit) { project.commit('570e7b2abdd848b95f2f578043fc23bd6f6fd24d') }
+        let(:diff_file) { commit.diffs.diff_file_with_new_path('files/ruby/popen.rb') }
+
+        it 'returns true' do
+          expect(diff_file.content_changed?).to be_truthy
+        end
+      end
+    end
+  end
+
+  describe '#simple_viewer' do
+    context 'when the file is not diffable' do
+      before do
+        allow(diff_file).to receive(:diffable?).and_return(false)
+      end
+
+      it 'returns a Not Diffable viewer' do
+        expect(diff_file.simple_viewer).to be_a(DiffViewer::NotDiffable)
+      end
+    end
+
+    context 'when the content changed' do
+      context 'when the file represented by the diff file is binary' do
+        before do
+          allow(diff_file).to receive(:raw_binary?).and_return(true)
+        end
+
+        it 'returns a No Preview viewer' do
+          expect(diff_file.simple_viewer).to be_a(DiffViewer::NoPreview)
+        end
+      end
+
+      context 'when the diff file old and new blob types are different' do
+        before do
+          allow(diff_file).to receive(:different_type?).and_return(true)
+        end
+
+        it 'returns a No Preview viewer' do
+          expect(diff_file.simple_viewer).to be_a(DiffViewer::NoPreview)
+        end
+      end
+
+      context 'when the file represented by the diff file is text-based' do
+        it 'returns a text viewer' do
+          expect(diff_file.simple_viewer).to be_a(DiffViewer::Text)
+        end
+      end
+    end
+
+    context 'when created' do
+      let(:commit) { project.commit('913c66a37b4a45b9769037c55c2d238bd0942d2e') }
+      let(:diff_file) { commit.diffs.diff_file_with_new_path('files/ruby/popen.rb') }
+
+      before do
+        allow(diff_file).to receive(:content_changed?).and_return(nil)
+      end
+
+      context 'when the file represented by the diff file is binary' do
+        before do
+          allow(diff_file).to receive(:raw_binary?).and_return(true)
+        end
+
+        it 'returns an Added viewer' do
+          expect(diff_file.simple_viewer).to be_a(DiffViewer::Added)
+        end
+      end
+
+      context 'when the diff file old and new blob types are different' do
+        before do
+          allow(diff_file).to receive(:different_type?).and_return(true)
+        end
+
+        it 'returns an Added viewer' do
+          expect(diff_file.simple_viewer).to be_a(DiffViewer::Added)
+        end
+      end
+
+      context 'when the file represented by the diff file is text-based' do
+        it 'returns a text viewer' do
+          expect(diff_file.simple_viewer).to be_a(DiffViewer::Text)
+        end
+      end
+    end
+
+    context 'when deleted' do
+      let(:commit) { project.commit('d59c60028b053793cecfb4022de34602e1a9218e') }
+      let(:diff_file) { commit.diffs.diff_file_with_old_path('files/js/commit.js.coffee') }
+
+      before do
+        allow(diff_file).to receive(:content_changed?).and_return(nil)
+      end
+
+      context 'when the file represented by the diff file is binary' do
+        before do
+          allow(diff_file).to receive(:raw_binary?).and_return(true)
+        end
+
+        it 'returns a Deleted viewer' do
+          expect(diff_file.simple_viewer).to be_a(DiffViewer::Deleted)
+        end
+      end
+
+      context 'when the diff file old and new blob types are different' do
+        before do
+          allow(diff_file).to receive(:different_type?).and_return(true)
+        end
+
+        it 'returns a Deleted viewer' do
+          expect(diff_file.simple_viewer).to be_a(DiffViewer::Deleted)
+        end
+      end
+
+      context 'when the file represented by the diff file is text-based' do
+        it 'returns a text viewer' do
+          expect(diff_file.simple_viewer).to be_a(DiffViewer::Text)
+        end
+      end
+    end
+
+    context 'when renamed' do
+      let(:commit) { project.commit('6907208d755b60ebeacb2e9dfea74c92c3449a1f') }
+      let(:diff_file) { commit.diffs.diff_file_with_new_path('files/js/commit.coffee') }
+
+      before do
+        allow(diff_file).to receive(:content_changed?).and_return(nil)
+      end
+
+      it 'returns a Renamed viewer' do
+        expect(diff_file.simple_viewer).to be_a(DiffViewer::Renamed)
+      end
+    end
+
+    context 'when mode changed' do
+      before do
+        allow(diff_file).to receive(:content_changed?).and_return(nil)
+        allow(diff_file).to receive(:mode_changed?).and_return(true)
+      end
+
+      it 'returns a Mode Changed viewer' do
+        expect(diff_file.simple_viewer).to be_a(DiffViewer::ModeChanged)
+      end
+    end
+  end
+
+  describe '#rich_viewer' do
+    let(:commit) { project.commit('2f63565e7aac07bcdadb654e253078b727143ec4') }
+    let(:diff_file) { commit.diffs.diff_file_with_new_path('files/images/6049019_460s.jpg') }
+
+    context 'when the diff file has a matching viewer' do
+      context 'when the diff file content did not change' do
+        before do
+          allow(diff_file).to receive(:content_changed?).and_return(false)
+        end
+
+        it 'returns nil' do
+          expect(diff_file.rich_viewer).to be_nil
+        end
+      end
+
+      context 'when the diff file is not diffable' do
+        before do
+          allow(diff_file).to receive(:diffable?).and_return(false)
+        end
+
+        it 'returns nil' do
+          expect(diff_file.rich_viewer).to be_nil
+        end
+      end
+
+      context 'when the diff file old and new blob types are different' do
+        before do
+          allow(diff_file).to receive(:different_type?).and_return(true)
+        end
+
+        it 'returns nil' do
+          expect(diff_file.rich_viewer).to be_nil
+        end
+      end
+
+      context 'when the diff file has an external storage error' do
+        before do
+          allow(diff_file).to receive(:external_storage_error?).and_return(true)
+        end
+
+        it 'returns nil' do
+          expect(diff_file.rich_viewer).to be_nil
+        end
+      end
+
+      context 'when everything is right' do
+        it 'returns the viewer' do
+          expect(diff_file.rich_viewer).to be_a(DiffViewer::Image)
+        end
+      end
+    end
+
+    context 'when the diff file does not have a matching viewer' do
+      let(:commit) { project.commit('570e7b2abdd848b95f2f578043fc23bd6f6fd24d') }
+      let(:diff_file) { commit.diffs.diff_file_with_new_path('files/ruby/popen.rb') }
+
+      it 'returns nil' do
+        expect(diff_file.rich_viewer).to be_nil
+      end
+    end
+  end
+
+  describe '#rendered_as_text?' do
+    context 'when the simple viewer is text-based' do
+      let(:commit) { project.commit('570e7b2abdd848b95f2f578043fc23bd6f6fd24d') }
+      let(:diff_file) { commit.diffs.diff_file_with_new_path('files/ruby/popen.rb') }
+
+      context 'when ignoring errors' do
+        context 'when the viewer has render errors' do
+          before do
+            diff_file.diff.too_large!
+          end
+
+          it 'returns true' do
+            expect(diff_file.rendered_as_text?).to be_truthy
+          end
+        end
+
+        context "when the viewer doesn't have render errors" do
+          it 'returns true' do
+            expect(diff_file.rendered_as_text?).to be_truthy
+          end
+        end
+      end
+
+      context 'when not ignoring errors' do
+        context 'when the viewer has render errors' do
+          before do
+            diff_file.diff.too_large!
+          end
+
+          it 'returns false' do
+            expect(diff_file.rendered_as_text?(ignore_errors: false)).to be_falsey
+          end
+        end
+
+        context "when the viewer doesn't have render errors" do
+          it 'returns true' do
+            expect(diff_file.rendered_as_text?(ignore_errors: false)).to be_truthy
+          end
+        end
+      end
+    end
+
+    context 'when the simple viewer is binary' do
+      let(:commit) { project.commit('2f63565e7aac07bcdadb654e253078b727143ec4') }
+      let(:diff_file) { commit.diffs.diff_file_with_new_path('files/images/6049019_460s.jpg') }
+
+      it 'returns false' do
+        expect(diff_file.rendered_as_text?).to be_falsey
+      end
+    end
+  end
 end
-- 
cgit v1.2.3


From a6ec5121f0c844786c84c568a3200562ec58a9c2 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Wed, 14 Jun 2017 13:18:56 -0500
Subject: Correct RSpec/SingleLineHook cop offenses

---
 spec/lib/gitlab/auth/unique_ips_limiter_spec.rb    |  4 +-
 spec/lib/gitlab/badge/build/status_spec.rb         |  8 ++-
 .../chat_commands/presenters/issue_search_spec.rb  |  4 +-
 spec/lib/gitlab/checks/change_access_spec.rb       |  8 ++-
 spec/lib/gitlab/ci/config/entry/cache_spec.rb      |  4 +-
 .../lib/gitlab/ci/config/entry/environment_spec.rb |  4 +-
 spec/lib/gitlab/ci/config/entry/global_spec.rb     | 24 +++++--
 spec/lib/gitlab/ci/config/entry/job_spec.rb        | 16 +++--
 spec/lib/gitlab/ci/config/entry/jobs_spec.rb       |  8 ++-
 spec/lib/gitlab/ci/config/entry/service_spec.rb    |  4 +-
 spec/lib/gitlab/ci/config/entry/services_spec.rb   |  4 +-
 spec/lib/gitlab/ci/status/build/cancelable_spec.rb |  4 +-
 spec/lib/gitlab/ci/status/build/common_spec.rb     |  8 ++-
 spec/lib/gitlab/ci/status/build/factory_spec.rb    |  4 +-
 spec/lib/gitlab/ci/status/build/play_spec.rb       |  4 +-
 spec/lib/gitlab/ci/status/build/retryable_spec.rb  |  4 +-
 spec/lib/gitlab/ci/status/build/stop_spec.rb       |  4 +-
 spec/lib/gitlab/ci/status/external/common_spec.rb  |  4 +-
 spec/lib/gitlab/ci/status/pipeline/common_spec.rb  |  4 +-
 spec/lib/gitlab/database_spec.rb                   | 16 +++--
 spec/lib/gitlab/gfm/reference_rewriter_spec.rb     |  4 +-
 spec/lib/gitlab/git/repository_spec.rb             | 40 ++++++++---
 spec/lib/gitlab/git_access_spec.rb                 | 68 +++++++++++++-----
 spec/lib/gitlab/gitaly_client_spec.rb              | 24 +++++--
 spec/lib/gitlab/highlight_spec.rb                  |  4 +-
 spec/lib/gitlab/i18n_spec.rb                       |  4 +-
 spec/lib/gitlab/ldap/adapter_spec.rb               | 16 +++--
 spec/lib/gitlab/ldap/user_spec.rb                  | 16 +++--
 .../gitlab/middleware/rails_queue_duration_spec.rb |  8 ++-
 spec/lib/gitlab/o_auth/auth_hash_spec.rb           | 12 +++-
 spec/lib/gitlab/o_auth/user_spec.rb                | 84 ++++++++++++++++------
 spec/lib/gitlab/redis_spec.rb                      | 13 +++-
 spec/lib/gitlab/saml/user_spec.rb                  | 62 ++++++++++++----
 spec/lib/gitlab/serializer/pagination_spec.rb      |  4 +-
 spec/lib/gitlab/template/issue_template_spec.rb    |  9 ++-
 .../gitlab/template/merge_request_template_spec.rb |  9 ++-
 36 files changed, 392 insertions(+), 125 deletions(-)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/auth/unique_ips_limiter_spec.rb b/spec/lib/gitlab/auth/unique_ips_limiter_spec.rb
index 94dcddcc30c..fc72df575be 100644
--- a/spec/lib/gitlab/auth/unique_ips_limiter_spec.rb
+++ b/spec/lib/gitlab/auth/unique_ips_limiter_spec.rb
@@ -40,7 +40,9 @@ describe Gitlab::Auth::UniqueIpsLimiter, :redis, lib: true do
     end
 
     context 'allow 2 unique ips' do
-      before { current_application_settings.update!(unique_ips_limit_per_user: 2) }
+      before do
+        current_application_settings.update!(unique_ips_limit_per_user: 2)
+      end
 
       it 'blocks user trying to login from third ip' do
         change_ip('ip1')
diff --git a/spec/lib/gitlab/badge/build/status_spec.rb b/spec/lib/gitlab/badge/build/status_spec.rb
index 3c5414701a7..6abf4ca46a9 100644
--- a/spec/lib/gitlab/badge/build/status_spec.rb
+++ b/spec/lib/gitlab/badge/build/status_spec.rb
@@ -29,7 +29,9 @@ describe Gitlab::Badge::Build::Status do
     let!(:build) { create_build(project, sha, branch) }
 
     context 'build success' do
-      before { build.success! }
+      before do
+        build.success!
+      end
 
       describe '#status' do
         it 'is successful' do
@@ -39,7 +41,9 @@ describe Gitlab::Badge::Build::Status do
     end
 
     context 'build failed' do
-      before { build.drop! }
+      before do
+        build.drop!
+      end
 
       describe '#status' do
         it 'failed' do
diff --git a/spec/lib/gitlab/chat_commands/presenters/issue_search_spec.rb b/spec/lib/gitlab/chat_commands/presenters/issue_search_spec.rb
index ec6d3e34a96..3799a324db4 100644
--- a/spec/lib/gitlab/chat_commands/presenters/issue_search_spec.rb
+++ b/spec/lib/gitlab/chat_commands/presenters/issue_search_spec.rb
@@ -4,7 +4,9 @@ describe Gitlab::ChatCommands::Presenters::IssueSearch do
   let(:project) { create(:empty_project) }
   let(:message) { subject[:text] }
 
-  before { create_list(:issue, 2, project: project) }
+  before do
+    create_list(:issue, 2, project: project)
+  end
 
   subject { described_class.new(project.issues).present }
 
diff --git a/spec/lib/gitlab/checks/change_access_spec.rb b/spec/lib/gitlab/checks/change_access_spec.rb
index c0c309d8179..643e590438a 100644
--- a/spec/lib/gitlab/checks/change_access_spec.rb
+++ b/spec/lib/gitlab/checks/change_access_spec.rb
@@ -20,7 +20,9 @@ describe Gitlab::Checks::ChangeAccess, lib: true do
       ).exec
     end
 
-    before { project.add_developer(user) }
+    before do
+      project.add_developer(user)
+    end
 
     context 'without failed checks' do
       it "doesn't raise an error" do
@@ -50,7 +52,9 @@ describe Gitlab::Checks::ChangeAccess, lib: true do
         let!(:protected_tag) { create(:protected_tag, project: project, name: 'v*') }
 
         context 'as master' do
-          before { project.add_master(user) }
+          before do
+            project.add_master(user)
+          end
 
           context 'deletion' do
             let(:oldrev) { 'be93687618e4b132087f430a4d8fc3a609c9b77c' }
diff --git a/spec/lib/gitlab/ci/config/entry/cache_spec.rb b/spec/lib/gitlab/ci/config/entry/cache_spec.rb
index 2ed120f356a..878b1d6b862 100644
--- a/spec/lib/gitlab/ci/config/entry/cache_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/cache_spec.rb
@@ -4,7 +4,9 @@ describe Gitlab::Ci::Config::Entry::Cache do
   let(:entry) { described_class.new(config) }
 
   describe 'validations' do
-    before { entry.compose! }
+    before do
+      entry.compose!
+    end
 
     context 'when entry config value is correct' do
       let(:config) do
diff --git a/spec/lib/gitlab/ci/config/entry/environment_spec.rb b/spec/lib/gitlab/ci/config/entry/environment_spec.rb
index c330e609337..3c0007f4d57 100644
--- a/spec/lib/gitlab/ci/config/entry/environment_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/environment_spec.rb
@@ -3,7 +3,9 @@ require 'spec_helper'
 describe Gitlab::Ci::Config::Entry::Environment do
   let(:entry) { described_class.new(config) }
 
-  before { entry.compose! }
+  before do
+    entry.compose!
+  end
 
   context 'when configuration is a string' do
     let(:config) { 'production' }
diff --git a/spec/lib/gitlab/ci/config/entry/global_spec.rb b/spec/lib/gitlab/ci/config/entry/global_spec.rb
index e5f85c712ca..293f112b2b0 100644
--- a/spec/lib/gitlab/ci/config/entry/global_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/global_spec.rb
@@ -33,7 +33,9 @@ describe Gitlab::Ci::Config::Entry::Global do
       end
 
       describe '#compose!' do
-        before { global.compose! }
+        before do
+          global.compose!
+        end
 
         it 'creates nodes hash' do
           expect(global.descendants).to be_an Array
@@ -79,7 +81,9 @@ describe Gitlab::Ci::Config::Entry::Global do
       end
 
       context 'when composed' do
-        before { global.compose! }
+        before do
+          global.compose!
+        end
 
         describe '#errors' do
           it 'has no errors' do
@@ -175,7 +179,9 @@ describe Gitlab::Ci::Config::Entry::Global do
     end
 
     context 'when most of entires not defined' do
-      before { global.compose! }
+      before do
+        global.compose!
+      end
 
       let(:hash) do
         { cache: { key: 'a' }, rspec: { script: %w[ls] } }
@@ -218,7 +224,9 @@ describe Gitlab::Ci::Config::Entry::Global do
     # details.
     #
     context 'when entires specified but not defined' do
-      before { global.compose! }
+      before do
+        global.compose!
+      end
 
       let(:hash) do
         { variables: nil, rspec: { script: 'rspec' } }
@@ -233,7 +241,9 @@ describe Gitlab::Ci::Config::Entry::Global do
   end
 
   context 'when configuration is not valid' do
-    before { global.compose! }
+    before do
+      global.compose!
+    end
 
     context 'when before script is not an array' do
       let(:hash) do
@@ -297,7 +307,9 @@ describe Gitlab::Ci::Config::Entry::Global do
   end
 
   describe '#[]' do
-    before { global.compose! }
+    before do
+      global.compose!
+    end
 
     let(:hash) do
       { cache: { key: 'a' }, rspec: { script: 'ls' } }
diff --git a/spec/lib/gitlab/ci/config/entry/job_spec.rb b/spec/lib/gitlab/ci/config/entry/job_spec.rb
index 8dc94a4eb33..92cba689f47 100644
--- a/spec/lib/gitlab/ci/config/entry/job_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/job_spec.rb
@@ -18,7 +18,9 @@ describe Gitlab::Ci::Config::Entry::Job do
   end
 
   describe 'validations' do
-    before { entry.compose! }
+    before do
+      entry.compose!
+    end
 
     context 'when entry config value is correct' do
       let(:config) { { script: 'rspec' } }
@@ -97,7 +99,9 @@ describe Gitlab::Ci::Config::Entry::Job do
     let(:deps) { double('deps', '[]' => unspecified) }
 
     context 'when job config overrides global config' do
-      before { entry.compose!(deps) }
+      before do
+        entry.compose!(deps)
+      end
 
       let(:config) do
         { script: 'rspec', image: 'some_image', cache: { key: 'test' } }
@@ -125,10 +129,14 @@ describe Gitlab::Ci::Config::Entry::Job do
   end
 
   context 'when composed' do
-    before { entry.compose! }
+    before do
+      entry.compose!
+    end
 
     describe '#value' do
-      before { entry.compose! }
+      before do
+        entry.compose!
+      end
 
       context 'when entry is correct' do
         let(:config) do
diff --git a/spec/lib/gitlab/ci/config/entry/jobs_spec.rb b/spec/lib/gitlab/ci/config/entry/jobs_spec.rb
index 7d104372ac6..c0a2b6517e3 100644
--- a/spec/lib/gitlab/ci/config/entry/jobs_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/jobs_spec.rb
@@ -4,7 +4,9 @@ describe Gitlab::Ci::Config::Entry::Jobs do
   let(:entry) { described_class.new(config) }
 
   describe 'validations' do
-    before { entry.compose! }
+    before do
+      entry.compose!
+    end
 
     context 'when entry config value is correct' do
       let(:config) { { rspec: { script: 'rspec' } } }
@@ -48,7 +50,9 @@ describe Gitlab::Ci::Config::Entry::Jobs do
   end
 
   context 'when valid job entries composed' do
-    before { entry.compose! }
+    before do
+      entry.compose!
+    end
 
     let(:config) do
       { rspec: { script: 'rspec' },
diff --git a/spec/lib/gitlab/ci/config/entry/service_spec.rb b/spec/lib/gitlab/ci/config/entry/service_spec.rb
index 2376de74554..7202fe525e4 100644
--- a/spec/lib/gitlab/ci/config/entry/service_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/service_spec.rb
@@ -3,7 +3,9 @@ require 'spec_helper'
 describe Gitlab::Ci::Config::Entry::Service do
   let(:entry) { described_class.new(config) }
 
-  before { entry.compose! }
+  before do
+    entry.compose!
+  end
 
   context 'when configuration is a string' do
     let(:config) { 'postgresql:9.5' }
diff --git a/spec/lib/gitlab/ci/config/entry/services_spec.rb b/spec/lib/gitlab/ci/config/entry/services_spec.rb
index b32e52f8f26..7c4319aee63 100644
--- a/spec/lib/gitlab/ci/config/entry/services_spec.rb
+++ b/spec/lib/gitlab/ci/config/entry/services_spec.rb
@@ -3,7 +3,9 @@ require 'spec_helper'
 describe Gitlab::Ci::Config::Entry::Services do
   let(:entry) { described_class.new(config) }
 
-  before { entry.compose! }
+  before do
+    entry.compose!
+  end
 
   context 'when configuration is valid' do
     let(:config) { ['postgresql:9.5', { name: 'postgresql:9.1', alias: 'postgres_old' }] }
diff --git a/spec/lib/gitlab/ci/status/build/cancelable_spec.rb b/spec/lib/gitlab/ci/status/build/cancelable_spec.rb
index 8ad9b7cdf07..114d2490490 100644
--- a/spec/lib/gitlab/ci/status/build/cancelable_spec.rb
+++ b/spec/lib/gitlab/ci/status/build/cancelable_spec.rb
@@ -47,7 +47,9 @@ describe Gitlab::Ci::Status::Build::Cancelable do
 
     describe '#has_action?' do
       context 'when user is allowed to update build' do
-        before { build.project.team << [user, :developer] }
+        before do
+          build.project.team << [user, :developer]
+        end
 
         it { is_expected.to have_action }
       end
diff --git a/spec/lib/gitlab/ci/status/build/common_spec.rb b/spec/lib/gitlab/ci/status/build/common_spec.rb
index 72bd7c4eb93..03d1f46b517 100644
--- a/spec/lib/gitlab/ci/status/build/common_spec.rb
+++ b/spec/lib/gitlab/ci/status/build/common_spec.rb
@@ -17,13 +17,17 @@ describe Gitlab::Ci::Status::Build::Common do
 
   describe '#has_details?' do
     context 'when user has access to read build' do
-      before { project.team << [user, :developer] }
+      before do
+        project.team << [user, :developer]
+      end
 
       it { is_expected.to have_details }
     end
 
     context 'when user does not have access to read build' do
-      before { project.update(public_builds: false) }
+      before do
+        project.update(public_builds: false)
+      end
 
       it { is_expected.not_to have_details }
     end
diff --git a/spec/lib/gitlab/ci/status/build/factory_spec.rb b/spec/lib/gitlab/ci/status/build/factory_spec.rb
index 3f30b2c38f2..c8a97016f20 100644
--- a/spec/lib/gitlab/ci/status/build/factory_spec.rb
+++ b/spec/lib/gitlab/ci/status/build/factory_spec.rb
@@ -6,7 +6,9 @@ describe Gitlab::Ci::Status::Build::Factory do
   let(:status) { factory.fabricate! }
   let(:factory) { described_class.new(build, user) }
 
-  before { project.team << [user, :developer] }
+  before do
+    project.team << [user, :developer]
+  end
 
   context 'when build is successful' do
     let(:build) { create(:ci_build, :success) }
diff --git a/spec/lib/gitlab/ci/status/build/play_spec.rb b/spec/lib/gitlab/ci/status/build/play_spec.rb
index 0e15a5f3c6b..32b2e62e4e0 100644
--- a/spec/lib/gitlab/ci/status/build/play_spec.rb
+++ b/spec/lib/gitlab/ci/status/build/play_spec.rb
@@ -28,7 +28,9 @@ describe Gitlab::Ci::Status::Build::Play do
       end
 
       context 'when user can not push to the branch' do
-        before { build.project.add_developer(user) }
+        before do
+          build.project.add_developer(user)
+        end
 
         it { is_expected.not_to have_action }
       end
diff --git a/spec/lib/gitlab/ci/status/build/retryable_spec.rb b/spec/lib/gitlab/ci/status/build/retryable_spec.rb
index 2db0f8d29bd..099d873fc01 100644
--- a/spec/lib/gitlab/ci/status/build/retryable_spec.rb
+++ b/spec/lib/gitlab/ci/status/build/retryable_spec.rb
@@ -47,7 +47,9 @@ describe Gitlab::Ci::Status::Build::Retryable do
 
     describe '#has_action?' do
       context 'when user is allowed to update build' do
-        before { build.project.team << [user, :developer] }
+        before do
+          build.project.team << [user, :developer]
+        end
 
         it { is_expected.to have_action }
       end
diff --git a/spec/lib/gitlab/ci/status/build/stop_spec.rb b/spec/lib/gitlab/ci/status/build/stop_spec.rb
index 8d021c35a69..23902f26b1a 100644
--- a/spec/lib/gitlab/ci/status/build/stop_spec.rb
+++ b/spec/lib/gitlab/ci/status/build/stop_spec.rb
@@ -19,7 +19,9 @@ describe Gitlab::Ci::Status::Build::Stop do
 
     describe '#has_action?' do
       context 'when user is allowed to update build' do
-        before { build.project.team << [user, :developer] }
+        before do
+          build.project.team << [user, :developer]
+        end
 
         it { is_expected.to have_action }
       end
diff --git a/spec/lib/gitlab/ci/status/external/common_spec.rb b/spec/lib/gitlab/ci/status/external/common_spec.rb
index e58f5d8d4df..b38fbee2486 100644
--- a/spec/lib/gitlab/ci/status/external/common_spec.rb
+++ b/spec/lib/gitlab/ci/status/external/common_spec.rb
@@ -28,7 +28,9 @@ describe Gitlab::Ci::Status::External::Common do
 
   describe '#has_details?' do
     context 'when user has access to read commit status' do
-      before { project.team << [user, :developer] }
+      before do
+        project.team << [user, :developer]
+      end
 
       it { is_expected.to have_details }
     end
diff --git a/spec/lib/gitlab/ci/status/pipeline/common_spec.rb b/spec/lib/gitlab/ci/status/pipeline/common_spec.rb
index d665674bf70..f5fd31e8d03 100644
--- a/spec/lib/gitlab/ci/status/pipeline/common_spec.rb
+++ b/spec/lib/gitlab/ci/status/pipeline/common_spec.rb
@@ -17,7 +17,9 @@ describe Gitlab::Ci::Status::Pipeline::Common do
 
   describe '#has_details?' do
     context 'when user has access to read pipeline' do
-      before { project.team << [user, :developer] }
+      before do
+        project.team << [user, :developer]
+      end
 
       it { is_expected.to have_details }
     end
diff --git a/spec/lib/gitlab/database_spec.rb b/spec/lib/gitlab/database_spec.rb
index 9b1d66a1b1c..26e5d73d333 100644
--- a/spec/lib/gitlab/database_spec.rb
+++ b/spec/lib/gitlab/database_spec.rb
@@ -53,14 +53,18 @@ describe Gitlab::Database, lib: true do
 
   describe '.nulls_last_order' do
     context 'when using PostgreSQL' do
-      before { expect(described_class).to receive(:postgresql?).and_return(true) }
+      before do
+        expect(described_class).to receive(:postgresql?).and_return(true)
+      end
 
       it { expect(described_class.nulls_last_order('column', 'ASC')).to eq 'column ASC NULLS LAST'}
       it { expect(described_class.nulls_last_order('column', 'DESC')).to eq 'column DESC NULLS LAST'}
     end
 
     context 'when using MySQL' do
-      before { expect(described_class).to receive(:postgresql?).and_return(false) }
+      before do
+        expect(described_class).to receive(:postgresql?).and_return(false)
+      end
 
       it { expect(described_class.nulls_last_order('column', 'ASC')).to eq 'column IS NULL, column ASC'}
       it { expect(described_class.nulls_last_order('column', 'DESC')).to eq 'column DESC'}
@@ -69,14 +73,18 @@ describe Gitlab::Database, lib: true do
 
   describe '.nulls_first_order' do
     context 'when using PostgreSQL' do
-      before { expect(described_class).to receive(:postgresql?).and_return(true) }
+      before do
+        expect(described_class).to receive(:postgresql?).and_return(true)
+      end
 
       it { expect(described_class.nulls_first_order('column', 'ASC')).to eq 'column ASC NULLS FIRST'}
       it { expect(described_class.nulls_first_order('column', 'DESC')).to eq 'column DESC NULLS FIRST'}
     end
 
     context 'when using MySQL' do
-      before { expect(described_class).to receive(:postgresql?).and_return(false) }
+      before do
+        expect(described_class).to receive(:postgresql?).and_return(false)
+      end
 
       it { expect(described_class.nulls_first_order('column', 'ASC')).to eq 'column ASC'}
       it { expect(described_class.nulls_first_order('column', 'DESC')).to eq 'column IS NULL, column DESC'}
diff --git a/spec/lib/gitlab/gfm/reference_rewriter_spec.rb b/spec/lib/gitlab/gfm/reference_rewriter_spec.rb
index 5d416c9eec3..eaec699ad90 100644
--- a/spec/lib/gitlab/gfm/reference_rewriter_spec.rb
+++ b/spec/lib/gitlab/gfm/reference_rewriter_spec.rb
@@ -6,7 +6,9 @@ describe Gitlab::Gfm::ReferenceRewriter do
   let(:new_project) { create(:empty_project, name: 'new-project') }
   let(:user) { create(:user) }
 
-  before { old_project.team << [user, :reporter] }
+  before do
+    old_project.team << [user, :reporter]
+  end
 
   describe '#rewrite' do
     subject do
diff --git a/spec/lib/gitlab/git/repository_spec.rb b/spec/lib/gitlab/git/repository_spec.rb
index e1e4aa9fde9..eee4c9eab6d 100644
--- a/spec/lib/gitlab/git/repository_spec.rb
+++ b/spec/lib/gitlab/git/repository_spec.rb
@@ -16,7 +16,9 @@ describe Gitlab::Git::Repository, seed_helper: true do
 
   describe '#root_ref' do
     context 'with gitaly disabled' do
-      before { allow(Gitlab::GitalyClient).to receive(:feature_enabled?).and_return(false) }
+      before do
+        allow(Gitlab::GitalyClient).to receive(:feature_enabled?).and_return(false)
+      end
 
       it 'calls #discover_default_branch' do
         expect(repository).to receive(:discover_default_branch)
@@ -25,8 +27,13 @@ describe Gitlab::Git::Repository, seed_helper: true do
     end
 
     context 'with gitaly enabled' do
-      before { stub_gitaly }
-      after { Gitlab::GitalyClient.clear_stubs! }
+      before do
+        stub_gitaly
+      end
+
+      after do
+        Gitlab::GitalyClient.clear_stubs!
+      end
 
       it 'gets the branch name from GitalyClient' do
         expect_any_instance_of(Gitlab::GitalyClient::Ref).to receive(:default_branch_name)
@@ -120,8 +127,13 @@ describe Gitlab::Git::Repository, seed_helper: true do
     it { is_expected.not_to include("branch-from-space") }
 
     context 'with gitaly enabled' do
-      before { stub_gitaly }
-      after { Gitlab::GitalyClient.clear_stubs! }
+      before do
+        stub_gitaly
+      end
+
+      after do
+        Gitlab::GitalyClient.clear_stubs!
+      end
 
       it 'gets the branch names from GitalyClient' do
         expect_any_instance_of(Gitlab::GitalyClient::Ref).to receive(:branch_names)
@@ -158,8 +170,13 @@ describe Gitlab::Git::Repository, seed_helper: true do
     it { is_expected.not_to include("v5.0.0") }
 
     context 'with gitaly enabled' do
-      before { stub_gitaly }
-      after { Gitlab::GitalyClient.clear_stubs! }
+      before do
+        stub_gitaly
+      end
+
+      after do
+        Gitlab::GitalyClient.clear_stubs!
+      end
 
       it 'gets the tag names from GitalyClient' do
         expect_any_instance_of(Gitlab::GitalyClient::Ref).to receive(:tag_names)
@@ -1280,8 +1297,13 @@ describe Gitlab::Git::Repository, seed_helper: true do
     end
 
     context 'with gitaly enabled' do
-      before { stub_gitaly }
-      after { Gitlab::GitalyClient.clear_stubs! }
+      before do
+        stub_gitaly
+      end
+
+      after do
+        Gitlab::GitalyClient.clear_stubs!
+      end
 
       it 'gets the branches from GitalyClient' do
         expect_any_instance_of(Gitlab::GitalyClient::Ref).to receive(:local_branches).
diff --git a/spec/lib/gitlab/git_access_spec.rb b/spec/lib/gitlab/git_access_spec.rb
index 36d1d777583..3dcc20c48e8 100644
--- a/spec/lib/gitlab/git_access_spec.rb
+++ b/spec/lib/gitlab/git_access_spec.rb
@@ -60,7 +60,9 @@ describe Gitlab::GitAccess, lib: true do
           let(:actor) { deploy_key }
 
           context 'when the DeployKey has access to the project' do
-            before { deploy_key.projects << project }
+            before do
+              deploy_key.projects << project
+            end
 
             it 'allows pull access' do
               expect { pull_access_check }.not_to raise_error
@@ -84,7 +86,9 @@ describe Gitlab::GitAccess, lib: true do
 
         context 'when actor is a User' do
           context 'when the User can read the project' do
-            before { project.team << [user, :master] }
+            before do
+              project.team << [user, :master]
+            end
 
             it 'allows pull access' do
               expect { pull_access_check }.not_to raise_error
@@ -159,7 +163,9 @@ describe Gitlab::GitAccess, lib: true do
   end
 
   describe '#check_command_disabled!' do
-    before { project.team << [user, :master] }
+    before do
+      project.team << [user, :master]
+    end
 
     context 'over http' do
       let(:protocol) { 'http' }
@@ -196,7 +202,9 @@ describe Gitlab::GitAccess, lib: true do
 
   describe '#check_download_access!' do
     describe 'master permissions' do
-      before { project.team << [user, :master] }
+      before do
+        project.team << [user, :master]
+      end
 
       context 'pull code' do
         it { expect { pull_access_check }.not_to raise_error }
@@ -204,7 +212,9 @@ describe Gitlab::GitAccess, lib: true do
     end
 
     describe 'guest permissions' do
-      before { project.team << [user, :guest] }
+      before do
+        project.team << [user, :guest]
+      end
 
       context 'pull code' do
         it { expect { pull_access_check }.to raise_unauthorized('You are not allowed to download code from this project.') }
@@ -253,7 +263,9 @@ describe Gitlab::GitAccess, lib: true do
 
       context 'pull code' do
         context 'when project is authorized' do
-          before { key.projects << project }
+          before do
+            key.projects << project
+          end
 
           it { expect { pull_access_check }.not_to raise_error }
         end
@@ -292,7 +304,9 @@ describe Gitlab::GitAccess, lib: true do
       end
 
       describe 'reporter user' do
-        before { project.team << [user, :reporter] }
+        before do
+          project.team << [user, :reporter]
+        end
 
         context 'pull code' do
           it { expect { pull_access_check }.not_to raise_error }
@@ -303,7 +317,9 @@ describe Gitlab::GitAccess, lib: true do
         let(:user) { create(:admin) }
 
         context 'when member of the project' do
-          before { project.team << [user, :reporter] }
+          before do
+            project.team << [user, :reporter]
+          end
 
           context 'pull code' do
             it { expect { pull_access_check }.not_to raise_error }
@@ -328,7 +344,9 @@ describe Gitlab::GitAccess, lib: true do
   end
 
   describe '#check_push_access!' do
-    before { merge_into_protected_branch }
+    before do
+      merge_into_protected_branch
+    end
     let(:unprotected_branch) { 'unprotected_branch' }
 
     let(:changes) do
@@ -457,19 +475,25 @@ describe Gitlab::GitAccess, lib: true do
 
     [%w(feature exact), ['feat*', 'wildcard']].each do |protected_branch_name, protected_branch_type|
       context do
-        before { create(:protected_branch, name: protected_branch_name, project: project) }
+        before do
+          create(:protected_branch, name: protected_branch_name, project: project)
+        end
 
         run_permission_checks(permissions_matrix)
       end
 
       context "when developers are allowed to push into the #{protected_branch_type} protected branch" do
-        before { create(:protected_branch, :developers_can_push, name: protected_branch_name, project: project) }
+        before do
+          create(:protected_branch, :developers_can_push, name: protected_branch_name, project: project)
+        end
 
         run_permission_checks(permissions_matrix.deep_merge(developer: { push_protected_branch: true, push_all: true, merge_into_protected_branch: true }))
       end
 
       context "developers are allowed to merge into the #{protected_branch_type} protected branch" do
-        before { create(:protected_branch, :developers_can_merge, name: protected_branch_name, project: project) }
+        before do
+          create(:protected_branch, :developers_can_merge, name: protected_branch_name, project: project)
+        end
 
         context "when a merge request exists for the given source/target branch" do
           context "when the merge request is in progress" do
@@ -496,13 +520,17 @@ describe Gitlab::GitAccess, lib: true do
       end
 
       context "when developers are allowed to push and merge into the #{protected_branch_type} protected branch" do
-        before { create(:protected_branch, :developers_can_merge, :developers_can_push, name: protected_branch_name, project: project) }
+        before do
+          create(:protected_branch, :developers_can_merge, :developers_can_push, name: protected_branch_name, project: project)
+        end
 
         run_permission_checks(permissions_matrix.deep_merge(developer: { push_protected_branch: true, push_all: true, merge_into_protected_branch: true }))
       end
 
       context "when no one is allowed to push to the #{protected_branch_name} protected branch" do
-        before { create(:protected_branch, :no_one_can_push, name: protected_branch_name, project: project) }
+        before do
+          create(:protected_branch, :no_one_can_push, name: protected_branch_name, project: project)
+        end
 
         run_permission_checks(permissions_matrix.deep_merge(developer: { push_protected_branch: false, push_all: false, merge_into_protected_branch: false },
                                                             master: { push_protected_branch: false, push_all: false, merge_into_protected_branch: false },
@@ -515,7 +543,9 @@ describe Gitlab::GitAccess, lib: true do
     let(:authentication_abilities) { build_authentication_abilities }
 
     context 'when project is authorized' do
-      before { project.team << [user, :reporter] }
+      before do
+        project.team << [user, :reporter]
+      end
 
       it { expect { push_access_check }.to raise_unauthorized('You are not allowed to upload code for this project.') }
     end
@@ -549,7 +579,9 @@ describe Gitlab::GitAccess, lib: true do
       let(:can_push) { true }
 
       context 'when project is authorized' do
-        before { key.projects << project }
+        before do
+          key.projects << project
+        end
 
         it { expect { push_access_check }.not_to raise_error }
       end
@@ -579,7 +611,9 @@ describe Gitlab::GitAccess, lib: true do
       let(:can_push) { false }
 
       context 'when project is authorized' do
-        before { key.projects << project }
+        before do
+          key.projects << project
+        end
 
         it { expect { push_access_check }.to raise_unauthorized('This deploy key does not have write access to this project.') }
       end
diff --git a/spec/lib/gitlab/gitaly_client_spec.rb b/spec/lib/gitlab/gitaly_client_spec.rb
index 95ecba67532..ce7b18b784a 100644
--- a/spec/lib/gitlab/gitaly_client_spec.rb
+++ b/spec/lib/gitlab/gitaly_client_spec.rb
@@ -5,7 +5,9 @@ require 'spec_helper'
 describe Gitlab::GitalyClient, lib: true, skip_gitaly_mock: true do
   describe '.stub' do
     # Notice that this is referring to gRPC "stubs", not rspec stubs
-    before { described_class.clear_stubs! }
+    before do
+      described_class.clear_stubs!
+    end
 
     context 'when passed a UNIX socket address' do
       it 'passes the address as-is to GRPC' do
@@ -41,7 +43,9 @@ describe Gitlab::GitalyClient, lib: true, skip_gitaly_mock: true do
     let(:real_feature_name) { "gitaly_#{feature_name}" }
 
     context 'when Gitaly is disabled' do
-      before { allow(described_class).to receive(:enabled?).and_return(false) }
+      before do
+        allow(described_class).to receive(:enabled?).and_return(false)
+      end
 
       it 'returns false' do
         expect(described_class.feature_enabled?(feature_name)).to be(false)
@@ -66,7 +70,9 @@ describe Gitlab::GitalyClient, lib: true, skip_gitaly_mock: true do
       end
 
       context "when the feature flag is set to disable" do
-        before { Feature.get(real_feature_name).disable }
+        before do
+          Feature.get(real_feature_name).disable
+        end
 
         it 'returns false' do
           expect(described_class.feature_enabled?(feature_name, status: feature_status)).to be(false)
@@ -74,7 +80,9 @@ describe Gitlab::GitalyClient, lib: true, skip_gitaly_mock: true do
       end
 
       context "when the feature flag is set to enable" do
-        before { Feature.get(real_feature_name).enable }
+        before do
+          Feature.get(real_feature_name).enable
+        end
 
         it 'returns true' do
           expect(described_class.feature_enabled?(feature_name, status: feature_status)).to be(true)
@@ -82,7 +90,9 @@ describe Gitlab::GitalyClient, lib: true, skip_gitaly_mock: true do
       end
 
       context "when the feature flag is set to a percentage of time" do
-        before { Feature.get(real_feature_name).enable_percentage_of_time(70) }
+        before do
+          Feature.get(real_feature_name).enable_percentage_of_time(70)
+        end
 
         it 'bases the result on pseudo-random numbers' do
           expect(Random).to receive(:rand).and_return(0.3)
@@ -104,7 +114,9 @@ describe Gitlab::GitalyClient, lib: true, skip_gitaly_mock: true do
       end
 
       context "when the feature flag is set to disable" do
-        before { Feature.get(real_feature_name).disable }
+        before do
+          Feature.get(real_feature_name).disable
+        end
 
         it 'returns false' do
           expect(described_class.feature_enabled?(feature_name, status: feature_status)).to be(false)
diff --git a/spec/lib/gitlab/highlight_spec.rb b/spec/lib/gitlab/highlight_spec.rb
index c2bb9f9a166..fdc5b484ef1 100644
--- a/spec/lib/gitlab/highlight_spec.rb
+++ b/spec/lib/gitlab/highlight_spec.rb
@@ -15,7 +15,9 @@ describe Gitlab::Highlight, lib: true do
       Gitlab::Highlight.new(blob.path, blob.data, repository: repository)
     end
 
-    before { project.change_head('gitattributes') }
+    before do
+      project.change_head('gitattributes')
+    end
 
     describe 'basic language selection' do
       let(:path) { 'custom-highlighting/test.gitlab-custom' }
diff --git a/spec/lib/gitlab/i18n_spec.rb b/spec/lib/gitlab/i18n_spec.rb
index a3dbeaa3753..0dba4132101 100644
--- a/spec/lib/gitlab/i18n_spec.rb
+++ b/spec/lib/gitlab/i18n_spec.rb
@@ -4,7 +4,9 @@ describe Gitlab::I18n, lib: true do
   let(:user) { create(:user, preferred_language: 'es') }
 
   describe '.locale=' do
-    after { described_class.use_default_locale }
+    after do
+      described_class.use_default_locale
+    end
 
     it 'sets the locale based on current user preferred language' do
       described_class.locale = user.preferred_language
diff --git a/spec/lib/gitlab/ldap/adapter_spec.rb b/spec/lib/gitlab/ldap/adapter_spec.rb
index 563c074017a..9454878b057 100644
--- a/spec/lib/gitlab/ldap/adapter_spec.rb
+++ b/spec/lib/gitlab/ldap/adapter_spec.rb
@@ -74,13 +74,17 @@ describe Gitlab::LDAP::Adapter, lib: true do
     subject { adapter.dn_matches_filter?(:dn, :filter) }
 
     context "when the search result is non-empty" do
-      before { allow(adapter).to receive(:ldap_search).and_return([:foo]) }
+      before do
+        allow(adapter).to receive(:ldap_search).and_return([:foo])
+      end
 
       it { is_expected.to be_truthy }
     end
 
     context "when the search result is empty" do
-      before { allow(adapter).to receive(:ldap_search).and_return([]) }
+      before do
+        allow(adapter).to receive(:ldap_search).and_return([])
+      end
 
       it { is_expected.to be_falsey }
     end
@@ -91,13 +95,17 @@ describe Gitlab::LDAP::Adapter, lib: true do
 
     context "when the search is successful" do
       context "and the result is non-empty" do
-        before { allow(ldap).to receive(:search).and_return([:foo]) }
+        before do
+          allow(ldap).to receive(:search).and_return([:foo])
+        end
 
         it { is_expected.to eq [:foo] }
       end
 
       context "and the result is empty" do
-        before { allow(ldap).to receive(:search).and_return([]) }
+        before do
+          allow(ldap).to receive(:search).and_return([])
+        end
 
         it { is_expected.to eq [] }
       end
diff --git a/spec/lib/gitlab/ldap/user_spec.rb b/spec/lib/gitlab/ldap/user_spec.rb
index a0eda685ca3..f0a1dd22fee 100644
--- a/spec/lib/gitlab/ldap/user_spec.rb
+++ b/spec/lib/gitlab/ldap/user_spec.rb
@@ -173,7 +173,9 @@ describe Gitlab::LDAP::User, lib: true do
 
     context 'signup' do
       context 'dont block on create' do
-        before { configure_block(false) }
+        before do
+          configure_block(false)
+        end
 
         it do
           ldap_user.save
@@ -183,7 +185,9 @@ describe Gitlab::LDAP::User, lib: true do
       end
 
       context 'block on create' do
-        before { configure_block(true) }
+        before do
+          configure_block(true)
+        end
 
         it do
           ldap_user.save
@@ -200,7 +204,9 @@ describe Gitlab::LDAP::User, lib: true do
       end
 
       context 'dont block on create' do
-        before { configure_block(false) }
+        before do
+          configure_block(false)
+        end
 
         it do
           ldap_user.save
@@ -210,7 +216,9 @@ describe Gitlab::LDAP::User, lib: true do
       end
 
       context 'block on create' do
-        before { configure_block(true) }
+        before do
+          configure_block(true)
+        end
 
         it do
           ldap_user.save
diff --git a/spec/lib/gitlab/middleware/rails_queue_duration_spec.rb b/spec/lib/gitlab/middleware/rails_queue_duration_spec.rb
index 168090d5b5c..88107536c9e 100644
--- a/spec/lib/gitlab/middleware/rails_queue_duration_spec.rb
+++ b/spec/lib/gitlab/middleware/rails_queue_duration_spec.rb
@@ -6,7 +6,9 @@ describe Gitlab::Middleware::RailsQueueDuration do
   let(:env) { {} }
   let(:transaction) { double(:transaction) }
 
-  before { expect(app).to receive(:call).with(env).and_return('yay') }
+  before do
+    expect(app).to receive(:call).with(env).and_return('yay')
+  end
 
   describe '#call' do
     it 'calls the app when metrics are disabled' do
@@ -15,7 +17,9 @@ describe Gitlab::Middleware::RailsQueueDuration do
     end
 
     context 'when metrics are enabled' do
-      before { allow(Gitlab::Metrics).to receive(:current_transaction).and_return(transaction) }
+      before do
+        allow(Gitlab::Metrics).to receive(:current_transaction).and_return(transaction)
+      end
 
       it 'calls the app when metrics are enabled but no timing header is found' do
         expect(middleware.call(env)).to eq('yay')
diff --git a/spec/lib/gitlab/o_auth/auth_hash_spec.rb b/spec/lib/gitlab/o_auth/auth_hash_spec.rb
index 8aaeb5779d3..19ab17419fc 100644
--- a/spec/lib/gitlab/o_auth/auth_hash_spec.rb
+++ b/spec/lib/gitlab/o_auth/auth_hash_spec.rb
@@ -55,7 +55,9 @@ describe Gitlab::OAuth::AuthHash, lib: true do
   end
 
   context 'email not provided' do
-    before { info_hash.delete(:email) }
+    before do
+      info_hash.delete(:email)
+    end
 
     it 'generates a temp email' do
       expect( auth_hash.email).to start_with('temp-email-for-oauth')
@@ -63,7 +65,9 @@ describe Gitlab::OAuth::AuthHash, lib: true do
   end
 
   context 'username not provided' do
-    before { info_hash.delete(:nickname) }
+    before do
+      info_hash.delete(:nickname)
+    end
 
     it 'takes the first part of the email as username' do
       expect(auth_hash.username).to eql 'onur.kucuk_ABC-123'
@@ -71,7 +75,9 @@ describe Gitlab::OAuth::AuthHash, lib: true do
   end
 
   context 'name not provided' do
-    before { info_hash.delete(:name) }
+    before do
+      info_hash.delete(:name)
+    end
 
     it 'concats first and lastname as the name' do
       expect(auth_hash.name).to eql name_utf8
diff --git a/spec/lib/gitlab/o_auth/user_spec.rb b/spec/lib/gitlab/o_auth/user_spec.rb
index 8943d1aa488..ea29cb9caf1 100644
--- a/spec/lib/gitlab/o_auth/user_spec.rb
+++ b/spec/lib/gitlab/o_auth/user_spec.rb
@@ -112,7 +112,9 @@ describe Gitlab::OAuth::User, lib: true do
         end
 
         context 'with new allow_single_sign_on enabled syntax' do
-          before { stub_omniauth_config(allow_single_sign_on: ['twitter']) }
+          before do
+            stub_omniauth_config(allow_single_sign_on: ['twitter'])
+          end
 
           it "creates a user from Omniauth" do
             oauth_user.save
@@ -125,7 +127,9 @@ describe Gitlab::OAuth::User, lib: true do
         end
 
         context "with old allow_single_sign_on enabled syntax" do
-          before { stub_omniauth_config(allow_single_sign_on: true) }
+          before do
+            stub_omniauth_config(allow_single_sign_on: true)
+          end
 
           it "creates a user from Omniauth" do
             oauth_user.save
@@ -138,14 +142,20 @@ describe Gitlab::OAuth::User, lib: true do
         end
 
         context 'with new allow_single_sign_on disabled syntax' do
-          before { stub_omniauth_config(allow_single_sign_on: []) }
+          before do
+            stub_omniauth_config(allow_single_sign_on: [])
+          end
+
           it 'throws an error' do
             expect{ oauth_user.save }.to raise_error StandardError
           end
         end
 
         context 'with old allow_single_sign_on disabled (Default)' do
-          before { stub_omniauth_config(allow_single_sign_on: false) }
+          before do
+            stub_omniauth_config(allow_single_sign_on: false)
+          end
+
           it 'throws an error' do
             expect{ oauth_user.save }.to raise_error StandardError
           end
@@ -153,21 +163,30 @@ describe Gitlab::OAuth::User, lib: true do
       end
 
       context "with auto_link_ldap_user disabled (default)" do
-        before { stub_omniauth_config(auto_link_ldap_user: false) }
+        before do
+          stub_omniauth_config(auto_link_ldap_user: false)
+        end
+
         include_examples "to verify compliance with allow_single_sign_on"
       end
 
       context "with auto_link_ldap_user enabled" do
-        before { stub_omniauth_config(auto_link_ldap_user: true) }
+        before do
+          stub_omniauth_config(auto_link_ldap_user: true)
+        end
 
         context "and no LDAP provider defined" do
-          before { stub_ldap_config(providers: []) }
+          before do
+            stub_ldap_config(providers: [])
+          end
 
           include_examples "to verify compliance with allow_single_sign_on"
         end
 
         context "and at least one LDAP provider is defined" do
-          before { stub_ldap_config(providers: %w(ldapmain)) }
+          before do
+            stub_ldap_config(providers: %w(ldapmain))
+          end
 
           context "and a corresponding LDAP person" do
             before do
@@ -238,7 +257,9 @@ describe Gitlab::OAuth::User, lib: true do
           end
 
           context "and no corresponding LDAP person" do
-            before { allow(Gitlab::LDAP::Person).to receive(:find_by_uid).and_return(nil) }
+            before do
+              allow(Gitlab::LDAP::Person).to receive(:find_by_uid).and_return(nil)
+            end
 
             include_examples "to verify compliance with allow_single_sign_on"
           end
@@ -248,11 +269,16 @@ describe Gitlab::OAuth::User, lib: true do
 
     describe 'blocking' do
       let(:provider) { 'twitter' }
-      before { stub_omniauth_config(allow_single_sign_on: ['twitter']) }
+
+      before do
+        stub_omniauth_config(allow_single_sign_on: ['twitter'])
+      end
 
       context 'signup with omniauth only' do
         context 'dont block on create' do
-          before { stub_omniauth_config(block_auto_created_users: false) }
+          before do
+            stub_omniauth_config(block_auto_created_users: false)
+          end
 
           it do
             oauth_user.save
@@ -262,7 +288,9 @@ describe Gitlab::OAuth::User, lib: true do
         end
 
         context 'block on create' do
-          before { stub_omniauth_config(block_auto_created_users: true) }
+          before do
+            stub_omniauth_config(block_auto_created_users: true)
+          end
 
           it do
             oauth_user.save
@@ -284,7 +312,9 @@ describe Gitlab::OAuth::User, lib: true do
 
         context "and no account for the LDAP user" do
           context 'dont block on create (LDAP)' do
-            before { allow_any_instance_of(Gitlab::LDAP::Config).to receive_messages(block_auto_created_users: false) }
+            before do
+              allow_any_instance_of(Gitlab::LDAP::Config).to receive_messages(block_auto_created_users: false)
+            end
 
             it do
               oauth_user.save
@@ -294,7 +324,9 @@ describe Gitlab::OAuth::User, lib: true do
           end
 
           context 'block on create (LDAP)' do
-            before { allow_any_instance_of(Gitlab::LDAP::Config).to receive_messages(block_auto_created_users: true) }
+            before do
+              allow_any_instance_of(Gitlab::LDAP::Config).to receive_messages(block_auto_created_users: true)
+            end
 
             it do
               oauth_user.save
@@ -308,7 +340,9 @@ describe Gitlab::OAuth::User, lib: true do
           let!(:existing_user) { create(:omniauth_user, email: 'john@example.com', extern_uid: 'uid=user1,ou=People,dc=example', provider: 'ldapmain', username: 'john') }
 
           context 'dont block on create (LDAP)' do
-            before { allow_any_instance_of(Gitlab::LDAP::Config).to receive_messages(block_auto_created_users: false) }
+            before do
+              allow_any_instance_of(Gitlab::LDAP::Config).to receive_messages(block_auto_created_users: false)
+            end
 
             it do
               oauth_user.save
@@ -318,7 +352,9 @@ describe Gitlab::OAuth::User, lib: true do
           end
 
           context 'block on create (LDAP)' do
-            before { allow_any_instance_of(Gitlab::LDAP::Config).to receive_messages(block_auto_created_users: true) }
+            before do
+              allow_any_instance_of(Gitlab::LDAP::Config).to receive_messages(block_auto_created_users: true)
+            end
 
             it do
               oauth_user.save
@@ -336,7 +372,9 @@ describe Gitlab::OAuth::User, lib: true do
         end
 
         context 'dont block on create' do
-          before { stub_omniauth_config(block_auto_created_users: false) }
+          before do
+            stub_omniauth_config(block_auto_created_users: false)
+          end
 
           it do
             oauth_user.save
@@ -346,7 +384,9 @@ describe Gitlab::OAuth::User, lib: true do
         end
 
         context 'block on create' do
-          before { stub_omniauth_config(block_auto_created_users: true) }
+          before do
+            stub_omniauth_config(block_auto_created_users: true)
+          end
 
           it do
             oauth_user.save
@@ -356,7 +396,9 @@ describe Gitlab::OAuth::User, lib: true do
         end
 
         context 'dont block on create (LDAP)' do
-          before { allow_any_instance_of(Gitlab::LDAP::Config).to receive_messages(block_auto_created_users: false) }
+          before do
+            allow_any_instance_of(Gitlab::LDAP::Config).to receive_messages(block_auto_created_users: false)
+          end
 
           it do
             oauth_user.save
@@ -366,7 +408,9 @@ describe Gitlab::OAuth::User, lib: true do
         end
 
         context 'block on create (LDAP)' do
-          before { allow_any_instance_of(Gitlab::LDAP::Config).to receive_messages(block_auto_created_users: true) }
+          before do
+            allow_any_instance_of(Gitlab::LDAP::Config).to receive_messages(block_auto_created_users: true)
+          end
 
           it do
             oauth_user.save
diff --git a/spec/lib/gitlab/redis_spec.rb b/spec/lib/gitlab/redis_spec.rb
index 8b77c925705..593aa5038ad 100644
--- a/spec/lib/gitlab/redis_spec.rb
+++ b/spec/lib/gitlab/redis_spec.rb
@@ -108,11 +108,18 @@ describe Gitlab::Redis do
   end
 
   describe '.with' do
-    before { clear_pool }
-    after { clear_pool }
+    before do
+      clear_pool
+    end
+
+    after do
+      clear_pool
+    end
 
     context 'when running not on sidekiq workers' do
-      before { allow(Sidekiq).to receive(:server?).and_return(false) }
+      before do
+        allow(Sidekiq).to receive(:server?).and_return(false)
+      end
 
       it 'instantiates a connection pool with size 5' do
         expect(ConnectionPool).to receive(:new).with(size: 5).and_call_original
diff --git a/spec/lib/gitlab/saml/user_spec.rb b/spec/lib/gitlab/saml/user_spec.rb
index b106d156b75..a4d2367b72a 100644
--- a/spec/lib/gitlab/saml/user_spec.rb
+++ b/spec/lib/gitlab/saml/user_spec.rb
@@ -31,11 +31,17 @@ describe Gitlab::Saml::User, lib: true do
       allow(Gitlab::Saml::Config).to receive_messages({ options: { name: 'saml', groups_attribute: 'groups', external_groups: groups, args: {} } })
     end
 
-    before { stub_basic_saml_config }
+    before do
+      stub_basic_saml_config
+    end
 
     describe 'account exists on server' do
-      before { stub_omniauth_config({ allow_single_sign_on: ['saml'], auto_link_saml_user: true }) }
+      before do
+        stub_omniauth_config({ allow_single_sign_on: ['saml'], auto_link_saml_user: true })
+      end
+
       let!(:existing_user) { create(:user, email: 'john@mail.com', username: 'john') }
+
       context 'and should bind with SAML' do
         it 'adds the SAML identity to the existing user' do
           saml_user.save
@@ -57,7 +63,10 @@ describe Gitlab::Saml::User, lib: true do
           end
         end
 
-        before { stub_saml_group_config(%w(Interns)) }
+        before do
+          stub_saml_group_config(%w(Interns))
+        end
+
         context 'are defined but the user does not belong there' do
           it 'does not mark the user as external' do
             saml_user.save
@@ -80,7 +89,9 @@ describe Gitlab::Saml::User, lib: true do
     describe 'no account exists on server' do
       shared_examples 'to verify compliance with allow_single_sign_on' do
         context 'with allow_single_sign_on enabled' do
-          before { stub_omniauth_config(allow_single_sign_on: ['saml']) }
+          before do
+            stub_omniauth_config(allow_single_sign_on: ['saml'])
+          end
 
           it 'creates a user from SAML' do
             saml_user.save
@@ -93,14 +104,20 @@ describe Gitlab::Saml::User, lib: true do
         end
 
         context 'with allow_single_sign_on default (["saml"])' do
-          before { stub_omniauth_config(allow_single_sign_on: ['saml']) }
+          before do
+            stub_omniauth_config(allow_single_sign_on: ['saml'])
+          end
+
           it 'does not throw an error' do
             expect{ saml_user.save }.not_to raise_error
           end
         end
 
         context 'with allow_single_sign_on disabled' do
-          before { stub_omniauth_config(allow_single_sign_on: false) }
+          before do
+            stub_omniauth_config(allow_single_sign_on: false)
+          end
+
           it 'throws an error' do
             expect{ saml_user.save }.to raise_error StandardError
           end
@@ -128,15 +145,22 @@ describe Gitlab::Saml::User, lib: true do
       end
 
       context 'with auto_link_ldap_user disabled (default)' do
-        before { stub_omniauth_config({ auto_link_ldap_user: false, auto_link_saml_user: false, allow_single_sign_on: ['saml'] }) }
+        before do
+          stub_omniauth_config({ auto_link_ldap_user: false, auto_link_saml_user: false, allow_single_sign_on: ['saml'] })
+        end
+
         include_examples 'to verify compliance with allow_single_sign_on'
       end
 
       context 'with auto_link_ldap_user enabled' do
-        before { stub_omniauth_config({ auto_link_ldap_user: true, auto_link_saml_user: false }) }
+        before do
+          stub_omniauth_config({ auto_link_ldap_user: true, auto_link_saml_user: false })
+        end
 
         context 'and at least one LDAP provider is defined' do
-          before { stub_ldap_config(providers: %w(ldapmain)) }
+          before do
+            stub_ldap_config(providers: %w(ldapmain))
+          end
 
           context 'and a corresponding LDAP person' do
             before do
@@ -239,11 +263,15 @@ describe Gitlab::Saml::User, lib: true do
     end
 
     describe 'blocking' do
-      before { stub_omniauth_config({ allow_single_sign_on: ['saml'], auto_link_saml_user: true }) }
+      before do
+        stub_omniauth_config({ allow_single_sign_on: ['saml'], auto_link_saml_user: true })
+      end
 
       context 'signup with SAML only' do
         context 'dont block on create' do
-          before { stub_omniauth_config(block_auto_created_users: false) }
+          before do
+            stub_omniauth_config(block_auto_created_users: false)
+          end
 
           it 'does not block the user' do
             saml_user.save
@@ -253,7 +281,9 @@ describe Gitlab::Saml::User, lib: true do
         end
 
         context 'block on create' do
-          before { stub_omniauth_config(block_auto_created_users: true) }
+          before do
+            stub_omniauth_config(block_auto_created_users: true)
+          end
 
           it 'blocks user' do
             saml_user.save
@@ -270,7 +300,9 @@ describe Gitlab::Saml::User, lib: true do
         end
 
         context 'dont block on create' do
-          before { stub_omniauth_config(block_auto_created_users: false) }
+          before do
+            stub_omniauth_config(block_auto_created_users: false)
+          end
 
           it do
             saml_user.save
@@ -280,7 +312,9 @@ describe Gitlab::Saml::User, lib: true do
         end
 
         context 'block on create' do
-          before { stub_omniauth_config(block_auto_created_users: true) }
+          before do
+            stub_omniauth_config(block_auto_created_users: true)
+          end
 
           it do
             saml_user.save
diff --git a/spec/lib/gitlab/serializer/pagination_spec.rb b/spec/lib/gitlab/serializer/pagination_spec.rb
index 519eb1b274f..1bc6536439e 100644
--- a/spec/lib/gitlab/serializer/pagination_spec.rb
+++ b/spec/lib/gitlab/serializer/pagination_spec.rb
@@ -22,7 +22,9 @@ describe Gitlab::Serializer::Pagination do
     let(:params) { { page: 1, per_page: 2 } }
 
     context 'when a multiple resources are present in relation' do
-      before { create_list(:user, 3) }
+      before do
+        create_list(:user, 3)
+      end
 
       it 'correctly paginates the resource' do
         expect(subject.count).to be 2
diff --git a/spec/lib/gitlab/template/issue_template_spec.rb b/spec/lib/gitlab/template/issue_template_spec.rb
index 329d1d74970..bf45c8d16d6 100644
--- a/spec/lib/gitlab/template/issue_template_spec.rb
+++ b/spec/lib/gitlab/template/issue_template_spec.rb
@@ -52,7 +52,10 @@ describe Gitlab::Template::IssueTemplate do
 
     context 'when repo is bare or empty' do
       let(:empty_project) { create(:empty_project) }
-      before { empty_project.add_user(user, Gitlab::Access::MASTER) }
+
+      before do
+        empty_project.add_user(user, Gitlab::Access::MASTER)
+      end
 
       it "returns empty array" do
         templates = subject.by_category('', empty_project)
@@ -77,7 +80,9 @@ describe Gitlab::Template::IssueTemplate do
     context "when repo is empty" do
       let(:empty_project) { create(:empty_project) }
 
-      before { empty_project.add_user(user, Gitlab::Access::MASTER) }
+      before do
+        empty_project.add_user(user, Gitlab::Access::MASTER)
+      end
 
       it "raises file not found" do
         issue_template = subject.new('.gitlab/issue_templates/not_existent.md', empty_project)
diff --git a/spec/lib/gitlab/template/merge_request_template_spec.rb b/spec/lib/gitlab/template/merge_request_template_spec.rb
index 2b0056d9bab..8479f92c8df 100644
--- a/spec/lib/gitlab/template/merge_request_template_spec.rb
+++ b/spec/lib/gitlab/template/merge_request_template_spec.rb
@@ -52,7 +52,10 @@ describe Gitlab::Template::MergeRequestTemplate do
 
     context 'when repo is bare or empty' do
       let(:empty_project) { create(:empty_project) }
-      before { empty_project.add_user(user, Gitlab::Access::MASTER) }
+
+      before do
+        empty_project.add_user(user, Gitlab::Access::MASTER)
+      end
 
       it "returns empty array" do
         templates = subject.by_category('', empty_project)
@@ -77,7 +80,9 @@ describe Gitlab::Template::MergeRequestTemplate do
     context "when repo is empty" do
       let(:empty_project) { create(:empty_project) }
 
-      before { empty_project.add_user(user, Gitlab::Access::MASTER) }
+      before do
+        empty_project.add_user(user, Gitlab::Access::MASTER)
+      end
 
       it "raises file not found" do
         issue_template = subject.new('.gitlab/merge_request_templates/not_existent.md', empty_project)
-- 
cgit v1.2.3


From 58821ebbb4fa1bbd280749ca2f64d7592a852c98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Rodr=C3=ADguez?= <alejorro70@gmail.com>
Date: Mon, 12 Jun 2017 17:37:43 -0400
Subject: Stop using deprecated `path` field on Gitaly messages

This revealed an error in our configuration generation in
gitlab:gitaly:install rake task. The fix is included
---
 spec/lib/gitlab/gitaly_client/notifications_spec.rb |  5 +++--
 spec/lib/gitlab/gitaly_client/ref_spec.rb           | 15 ++++++++++-----
 spec/lib/gitlab/workhorse_spec.rb                   |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'spec/lib/gitlab')

diff --git a/spec/lib/gitlab/gitaly_client/notifications_spec.rb b/spec/lib/gitlab/gitaly_client/notifications_spec.rb
index b87dacb175b..e5c9e06a15e 100644
--- a/spec/lib/gitlab/gitaly_client/notifications_spec.rb
+++ b/spec/lib/gitlab/gitaly_client/notifications_spec.rb
@@ -3,12 +3,13 @@ require 'spec_helper'
 describe Gitlab::GitalyClient::Notifications do
   describe '#post_receive' do
     let(:project) { create(:empty_project) }
-    let(:repo_path) { project.repository.path_to_repo }
+    let(:storage_name) { project.repository_storage }
+    let(:relative_path) { project.path_with_namespace + '.git' }
     subject { described_class.new(project.repository) }
 
     it 'sends a post_receive message' do
       expect_any_instance_of(Gitaly::Notifications::Stub).
-        to receive(:post_receive).with(gitaly_request_with_repo_path(repo_path))
+        to receive(:post_receive).with(gitaly_request_with_path(storage_name, relative_path))
 
       subject.post_receive
     end
diff --git a/spec/lib/gitlab/gitaly_client/ref_spec.rb b/spec/lib/gitlab/gitaly_client/ref_spec.rb
index d8cd2dcbd2a..2ea44ef74b0 100644
--- a/spec/lib/gitlab/gitaly_client/ref_spec.rb
+++ b/spec/lib/gitlab/gitaly_client/ref_spec.rb
@@ -2,7 +2,8 @@ require 'spec_helper'
 
 describe Gitlab::GitalyClient::Ref do
   let(:project) { create(:empty_project) }
-  let(:repo_path) { project.repository.path_to_repo }
+  let(:storage_name) { project.repository_storage }
+  let(:relative_path) { project.path_with_namespace + '.git' }
   let(:client) { described_class.new(project.repository) }
 
   before do
@@ -19,7 +20,8 @@ describe Gitlab::GitalyClient::Ref do
   describe '#branch_names' do
     it 'sends a find_all_branch_names message' do
       expect_any_instance_of(Gitaly::Ref::Stub).
-        to receive(:find_all_branch_names).with(gitaly_request_with_repo_path(repo_path)).
+        to receive(:find_all_branch_names).
+          with(gitaly_request_with_path(storage_name, relative_path)).
           and_return([])
 
       client.branch_names
@@ -29,7 +31,8 @@ describe Gitlab::GitalyClient::Ref do
   describe '#tag_names' do
     it 'sends a find_all_tag_names message' do
       expect_any_instance_of(Gitaly::Ref::Stub).
-        to receive(:find_all_tag_names).with(gitaly_request_with_repo_path(repo_path)).
+        to receive(:find_all_tag_names).
+          with(gitaly_request_with_path(storage_name, relative_path)).
           and_return([])
 
       client.tag_names
@@ -39,7 +42,8 @@ describe Gitlab::GitalyClient::Ref do
   describe '#default_branch_name' do
     it 'sends a find_default_branch_name message' do
       expect_any_instance_of(Gitaly::Ref::Stub).
-        to receive(:find_default_branch_name).with(gitaly_request_with_repo_path(repo_path)).
+        to receive(:find_default_branch_name).
+          with(gitaly_request_with_path(storage_name, relative_path)).
         and_return(double(name: 'foo'))
 
       client.default_branch_name
@@ -49,7 +53,8 @@ describe Gitlab::GitalyClient::Ref do
   describe '#local_branches' do
     it 'sends a find_local_branches message' do
       expect_any_instance_of(Gitaly::Ref::Stub).
-        to receive(:find_local_branches).with(gitaly_request_with_repo_path(repo_path)).
+        to receive(:find_local_branches).
+          with(gitaly_request_with_path(storage_name, relative_path)).
           and_return([])
 
       client.local_branches
diff --git a/spec/lib/gitlab/workhorse_spec.rb b/spec/lib/gitlab/workhorse_spec.rb
index b1999409170..ad19998dff4 100644
--- a/spec/lib/gitlab/workhorse_spec.rb
+++ b/spec/lib/gitlab/workhorse_spec.rb
@@ -212,7 +212,7 @@ describe Gitlab::Workhorse, lib: true do
 
       it 'includes a Repository param' do
         repo_param = { Repository: {
-          path: repo_path,
+          path: '', # deprecated field; grpc automatically creates it anyway
           storage_name: 'default',
           relative_path: project.full_path + '.git'
         } }
-- 
cgit v1.2.3