From b372968e936a8b02f8d7ff73a1e1cc25b332406c Mon Sep 17 00:00:00 2001
From: Baldinof <baldinof@gmail.com>
Date: Tue, 22 Mar 2016 10:56:44 +0100
Subject: Add number sign on external issue reference text

---
 spec/models/external_issue_spec.rb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'spec/models')

diff --git a/spec/models/external_issue_spec.rb b/spec/models/external_issue_spec.rb
index 9b144dd1ecc..b3d0c4efe98 100644
--- a/spec/models/external_issue_spec.rb
+++ b/spec/models/external_issue_spec.rb
@@ -36,4 +36,10 @@ describe ExternalIssue, models: true do
       expect(issue.title).to eq "External Issue #{issue}"
     end
   end
+
+  describe '#reference_link_text' do
+    it 'returns a String reference to the object' do
+      expect(issue.reference_link_text).to eq '#EXT-1234'
+    end
+  end
 end
-- 
cgit v1.2.1


From 5ffa8f057095fb2fe12a60ffa0dd3a611d2f1aeb Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Sat, 9 Apr 2016 18:40:15 -0400
Subject: Escape the query argument provided to `git grep` by `search_files`

Closes #14963.
---
 spec/models/repository_spec.rb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'spec/models')

diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index 4e49c413f23..bce30aafc4c 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -94,6 +94,12 @@ describe Repository, models: true do
 
     it { is_expected.to be_an Array }
 
+    it 'regex-escapes the query string' do
+      results = repository.search_files("test\\", 'master')
+
+      expect(results.first).not_to start_with('fatal:')
+    end
+
     describe 'result' do
       subject { results.first }
 
-- 
cgit v1.2.1


From 5d88de092f37497d9c08878954b099c425376bda Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Tue, 12 Apr 2016 11:43:15 +0530
Subject: Refactor `Issue#related_branches`

- Previously, the controller held the logic to calculate
  related branches, which was:

  `<branches ending with `issue.iid`> - <branches with a merge request referenced in the current issue>`

- This logic belongs in the `related_branches` method, not in the
  controller. This commit makes this change.

- This means that `Issue#related_branches` now needs to take a `User`.
  When we find the branches that have a merge request referenced in the
  current issue, this is limited to merge requests that the current user
  has access to.

- This is not directly related to #14566, but is a related refactoring.
---
 spec/models/issue_spec.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'spec/models')

diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index 15052aaca28..f33b705810e 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -192,10 +192,11 @@ describe Issue, models: true do
 
   describe '#related_branches' do
     it "selects the right branches" do
+      user = build(:user)
       allow(subject.project.repository).to receive(:branch_names).
         and_return(["mpempe", "#{subject.iid}mepmep", subject.to_branch_name])
 
-      expect(subject.related_branches).to eq([subject.to_branch_name])
+      expect(subject.related_branches(user)).to eq([subject.to_branch_name])
     end
   end
 
-- 
cgit v1.2.1


From 3918fce5bd073e18addb7d1d4aaf3c81ce8150b0 Mon Sep 17 00:00:00 2001
From: Baldinof <baldinof@gmail.com>
Date: Tue, 12 Apr 2016 10:01:52 +0200
Subject: Hide number sign for string prefixed external issues

---
 spec/models/external_issue_spec.rb | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'spec/models')

diff --git a/spec/models/external_issue_spec.rb b/spec/models/external_issue_spec.rb
index b3d0c4efe98..4fc3b065592 100644
--- a/spec/models/external_issue_spec.rb
+++ b/spec/models/external_issue_spec.rb
@@ -38,8 +38,17 @@ describe ExternalIssue, models: true do
   end
 
   describe '#reference_link_text' do
-    it 'returns a String reference to the object' do
-      expect(issue.reference_link_text).to eq '#EXT-1234'
+    context 'if issue id has a prefix' do
+      it 'returns the issue ID' do
+        expect(issue.reference_link_text).to eq 'EXT-1234'
+      end
+    end
+
+    context 'if issue id is a number' do
+      let(:issue)   { described_class.new('1234', project) }
+      it 'returns the issue ID prefixed by #' do
+        expect(issue.reference_link_text).to eq '#1234'
+      end
     end
   end
 end
-- 
cgit v1.2.1


From 91034af3c998ce4a4f83281525304e8c50add384 Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Tue, 12 Apr 2016 15:50:19 +0530
Subject: Augment the tests for `Issue#related_branches`

- Test the case where we have a referenced merge request that's being
- excluded as a "related branch"
- This took a while to figure out, especially the
  `create_cross_references!` line.
---
 spec/models/issue_spec.rb | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

(limited to 'spec/models')

diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index f33b705810e..8cacce6a7bf 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -191,11 +191,27 @@ describe Issue, models: true do
   end
 
   describe '#related_branches' do
-    it "selects the right branches" do
-      user = build(:user)
+    let(:user) { build(:user, :admin) }
+    let(:merge_request) { create(:merge_request, description: "Closes ##{subject.iid}",
+                                 source_project: subject.project, source_branch: "branch-#{subject.iid}") }
+
+    before(:each) do
       allow(subject.project.repository).to receive(:branch_names).
-        and_return(["mpempe", "#{subject.iid}mepmep", subject.to_branch_name])
+                                            and_return(["mpempe", "#{subject.iid}mepmep", subject.to_branch_name, "branch-#{subject.iid}"])
+
+      # Without this stub, the `create(:merge_request)` above fails because it can't find
+      # the source branch. This seems like a reasonable compromise, in comparison with
+      # setting up a full repo here.
+      allow_any_instance_of(MergeRequest).to receive(:create_merge_request_diff)
+    end
+
+    it "selects the right branches when there are no referenced merge requests" do
+      expect(subject.related_branches(user)).to eq([subject.to_branch_name, "branch-#{subject.iid}"])
+    end
 
+    it "selects the right branches when there is a referenced merge request" do
+      merge_request.create_cross_references!(user)
+      expect(subject.referenced_merge_requests).to_not be_empty
       expect(subject.related_branches(user)).to eq([subject.to_branch_name])
     end
   end
-- 
cgit v1.2.1


From 66ca80181bcb5aef97296fde567b899603186be6 Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Tue, 12 Apr 2016 16:01:44 +0530
Subject: Test the `Issue#to_branch_name` method.

---
 spec/models/issue_spec.rb | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'spec/models')

diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index 8cacce6a7bf..22dabaa0404 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -228,10 +228,19 @@ describe Issue, models: true do
   end
 
   describe "#to_branch_name" do
-    let(:issue) { create(:issue, title: 'a' * 30) }
+    let(:issue) { create(:issue, title: 'testing-issue') }
 
-    it "starts with the issue iid" do
+    it "ends with the issue iid" do
       expect(issue.to_branch_name).to match /-#{issue.iid}\z/
     end
+
+    it "contains the issue title if not confidential" do
+      expect(issue.to_branch_name).to match /\Atesting-issue/
+    end
+
+    it "does not contain the issue title if confidential" do
+      issue = create(:issue, title: 'testing-issue', confidential: true)
+      expect(issue.to_branch_name).to match /\Aissue/
+    end
   end
 end
-- 
cgit v1.2.1


From 8dd1a6fc917231e83fb64dbfa65e1edbe9ab3fee Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Wed, 13 Apr 2016 09:04:08 +0530
Subject: Fix the rubocop check.

---
 spec/models/issue_spec.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'spec/models')

diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index 22dabaa0404..202ce846dca 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -192,8 +192,6 @@ describe Issue, models: true do
 
   describe '#related_branches' do
     let(:user) { build(:user, :admin) }
-    let(:merge_request) { create(:merge_request, description: "Closes ##{subject.iid}",
-                                 source_project: subject.project, source_branch: "branch-#{subject.iid}") }
 
     before(:each) do
       allow(subject.project.repository).to receive(:branch_names).
@@ -210,6 +208,9 @@ describe Issue, models: true do
     end
 
     it "selects the right branches when there is a referenced merge request" do
+      merge_request = create(:merge_request, { description: "Closes ##{subject.iid}",
+                                               source_project: subject.project,
+                                               source_branch: "branch-#{subject.iid}" })
       merge_request.create_cross_references!(user)
       expect(subject.referenced_merge_requests).to_not be_empty
       expect(subject.related_branches(user)).to eq([subject.to_branch_name])
-- 
cgit v1.2.1


From 3ea955a637127e6e11bc9fe270f87f63226b9d86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Tue, 5 Apr 2016 15:11:31 +0200
Subject: Improve TeamcityService and its specs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 .../project_services/teamcity_service_spec.rb      | 251 ++++++++++++++++-----
 1 file changed, 199 insertions(+), 52 deletions(-)

(limited to 'spec/models')

diff --git a/spec/models/project_services/teamcity_service_spec.rb b/spec/models/project_services/teamcity_service_spec.rb
index f26b47a856c..bc7423cee69 100644
--- a/spec/models/project_services/teamcity_service_spec.rb
+++ b/spec/models/project_services/teamcity_service_spec.rb
@@ -21,73 +21,220 @@
 require 'spec_helper'
 
 describe TeamcityService, models: true do
-  describe "Associations" do
+  describe 'Associations' do
     it { is_expected.to belong_to :project }
     it { is_expected.to have_one :service_hook }
   end
 
-  describe "Execute" do
-    let(:user)    { create(:user) }
-    let(:project) { create(:project) }
-
-    context "when a password was previously set" do
-      before do
-        @teamcity_service = TeamcityService.create(
-          project: create(:project),
-          properties: {
-            teamcity_url: 'http://gitlab.com',
-            username: 'mic',
-            password: "password"
-          }
-        )
+  describe 'Validations' do
+    describe '#teamcity_url' do
+      it 'does not validate the presence of teamcity_url if service is not active' do
+        teamcity_service = service
+        teamcity_service.active = false
+
+        expect(teamcity_service).not_to validate_presence_of(:teamcity_url)
       end
-  
-      it "reset password if url changed" do
-        @teamcity_service.teamcity_url = 'http://gitlab1.com'
-        @teamcity_service.save
-        expect(@teamcity_service.password).to be_nil
+
+      it 'validates the presence of teamcity_url if service is active' do
+        teamcity_service = service
+        teamcity_service.active = true
+
+        expect(teamcity_service).to validate_presence_of(:teamcity_url)
+      end
+    end
+
+    describe '#build_type' do
+      it 'does not validate the presence of build_type if service is not active' do
+        teamcity_service = service
+        teamcity_service.active = false
+
+        expect(teamcity_service).not_to validate_presence_of(:build_type)
+      end
+
+      it 'validates the presence of build_type if service is active' do
+        teamcity_service = service
+        teamcity_service.active = true
+
+        expect(teamcity_service).to validate_presence_of(:build_type)
       end
-  
-      it "does not reset password if username changed" do
-        @teamcity_service.username = "some_name"
-        @teamcity_service.save
-        expect(@teamcity_service.password).to eq("password")
+    end
+
+    describe '#username' do
+      it 'does not validate the presence of username if service is not active' do
+        teamcity_service = service
+        teamcity_service.active = false
+
+        expect(teamcity_service).not_to validate_presence_of(:username)
       end
 
-      it "does not reset password if new url is set together with password, even if it's the same password" do
-        @teamcity_service.teamcity_url = 'http://gitlab_edited.com'
-        @teamcity_service.password = 'password'
-        @teamcity_service.save
-        expect(@teamcity_service.password).to eq("password")
-        expect(@teamcity_service.teamcity_url).to eq("http://gitlab_edited.com")
+      it 'does not validate the presence of username if username is nil' do
+        teamcity_service = service
+        teamcity_service.active = true
+        teamcity_service.password = nil
+
+        expect(teamcity_service).not_to validate_presence_of(:username)
       end
 
-      it "should reset password if url changed, even if setter called multiple times" do
-        @teamcity_service.teamcity_url = 'http://gitlab1.com'
-        @teamcity_service.teamcity_url = 'http://gitlab1.com'
-        @teamcity_service.save
-        expect(@teamcity_service.password).to be_nil
+      it 'validates the presence of username if service is active and username is present' do
+        teamcity_service = service
+        teamcity_service.active = true
+        teamcity_service.password = 'secret'
+
+        expect(teamcity_service).to validate_presence_of(:username)
       end
     end
-    
-    context "when no password was previously set" do
-      before do
-        @teamcity_service = TeamcityService.create(
-          project: create(:project),
-          properties: {
-            teamcity_url: 'http://gitlab.com',
-            username: 'mic'
-          }
-        )
+
+    describe '#password' do
+      it 'does not validate the presence of password if service is not active' do
+        teamcity_service = service
+        teamcity_service.active = false
+
+        expect(teamcity_service).not_to validate_presence_of(:password)
+      end
+
+      it 'does not validate the presence of password if username is nil' do
+        teamcity_service = service
+        teamcity_service.active = true
+        teamcity_service.username = nil
+
+        expect(teamcity_service).not_to validate_presence_of(:password)
       end
 
-      it "saves password if new url is set together with password" do
-        @teamcity_service.teamcity_url = 'http://gitlab_edited.com'
-        @teamcity_service.password = 'password'
-        @teamcity_service.save
-        expect(@teamcity_service.password).to eq("password")
-        expect(@teamcity_service.teamcity_url).to eq("http://gitlab_edited.com")
+      it 'validates the presence of password if service is active and username is present' do
+        teamcity_service = service
+        teamcity_service.active = true
+        teamcity_service.username = 'john'
+
+        expect(teamcity_service).to validate_presence_of(:password)
       end
     end
   end
+
+  describe 'Callbacks' do
+    describe 'before_update :reset_password' do
+      context 'when a password was previously set' do
+        it 'resets password if url changed' do
+          teamcity_service = service
+
+          teamcity_service.teamcity_url = 'http://gitlab1.com'
+          teamcity_service.save
+
+          expect(teamcity_service.password).to be_nil
+        end
+
+        it 'does not reset password if username changed' do
+          teamcity_service = service
+
+          teamcity_service.username = 'some_name'
+          teamcity_service.save
+
+          expect(teamcity_service.password).to eq('password')
+        end
+
+        it "does not reset password if new url is set together with password, even if it's the same password" do
+          teamcity_service = service
+
+          teamcity_service.teamcity_url = 'http://gitlab_edited.com'
+          teamcity_service.password = 'password'
+          teamcity_service.save
+
+          expect(teamcity_service.password).to eq('password')
+          expect(teamcity_service.teamcity_url).to eq('http://gitlab_edited.com')
+        end
+      end
+
+      it 'saves password if new url is set together with password when no password was previously set' do
+        teamcity_service = service
+        teamcity_service.password = nil
+
+        teamcity_service.teamcity_url = 'http://gitlab_edited.com'
+        teamcity_service.password = 'password'
+        teamcity_service.save
+
+        expect(teamcity_service.password).to eq('password')
+        expect(teamcity_service.teamcity_url).to eq('http://gitlab_edited.com')
+      end
+    end
+  end
+
+  describe '#build_page' do
+    it 'returns a specific URL when status is 500' do
+      stub_request(status: 500)
+
+      expect(service.build_page('123', 'unused')).to eq('http://gitlab.com/viewLog.html?buildTypeId=foo')
+    end
+
+    it 'returns a build URL when teamcity_url has no trailing slash' do
+      stub_request(body: %Q({"build":{"id":"666"}}))
+
+      expect(service(teamcity_url: 'http://gitlab.com').build_page('123', 'unused')).to eq('http://gitlab.com/viewLog.html?buildId=666&buildTypeId=foo')
+    end
+
+    it 'returns a build URL when teamcity_url has a trailing slash' do
+      stub_request(body: %Q({"build":{"id":"666"}}))
+
+      expect(service(teamcity_url: 'http://gitlab.com/').build_page('123', 'unused')).to eq('http://gitlab.com/viewLog.html?buildId=666&buildTypeId=foo')
+    end
+  end
+
+  describe '#commit_status' do
+    it 'sets commit status to :error when status is 500' do
+      stub_request(status: 500)
+
+      expect(service.commit_status('123', 'unused')).to eq(:error)
+    end
+
+    it 'sets commit status to "pending" when status is 404' do
+      stub_request(status: 404)
+
+      expect(service.commit_status('123', 'unused')).to eq('pending')
+    end
+
+    it 'sets commit status to "success" when build status contains SUCCESS' do
+      stub_request(build_status: 'YAY SUCCESS!')
+
+      expect(service.commit_status('123', 'unused')).to eq('success')
+    end
+
+    it 'sets commit status to "failed" when build status contains FAILURE' do
+      stub_request(build_status: 'NO FAILURE!')
+
+      expect(service.commit_status('123', 'unused')).to eq('failed')
+    end
+
+    it 'sets commit status to "pending" when build status contains Pending' do
+      stub_request(build_status: 'NO Pending!')
+
+      expect(service.commit_status('123', 'unused')).to eq('pending')
+    end
+
+    it 'sets commit status to :error when build status is unknown' do
+      stub_request(build_status: 'FOO BAR!')
+
+      expect(service.commit_status('123', 'unused')).to eq(:error)
+    end
+  end
+
+  def service(teamcity_url: 'http://gitlab.com')
+    described_class.create(
+      project: build_stubbed(:empty_project),
+      properties: {
+        teamcity_url: teamcity_url,
+        username: 'mic',
+        password: 'password',
+        build_type: 'foo'
+      }
+    )
+  end
+
+  def stub_request(status: 200, body: nil, build_status: 'success')
+    teamcity_full_url = 'http://mic:password@gitlab.com/httpAuth/app/rest/builds/branch:unspecified:any,number:123'
+    body ||= %Q({"build":{"status":"#{build_status}","id":"666"}})
+
+    WebMock.stub_request(:get, teamcity_full_url).to_return(
+      status: status,
+      headers: { 'Content-Type' => 'application/json' },
+      body: body
+    )
+  end
 end
-- 
cgit v1.2.1


From acf911eeae0e952aec52d0e491efb69c99fb31f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Tue, 12 Apr 2016 18:09:52 +0200
Subject: Fix a bug with trailing slash in bamboo_url
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Also, improve specs for BambooService

Similar to https://gitlab.com/gitlab-org/gitlab-ce/issues/3515

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 .../models/project_services/bamboo_service_spec.rb | 262 +++++++++++++++++----
 1 file changed, 210 insertions(+), 52 deletions(-)

(limited to 'spec/models')

diff --git a/spec/models/project_services/bamboo_service_spec.rb b/spec/models/project_services/bamboo_service_spec.rb
index c34b2487ecf..31b2c90122d 100644
--- a/spec/models/project_services/bamboo_service_spec.rb
+++ b/spec/models/project_services/bamboo_service_spec.rb
@@ -21,74 +21,232 @@
 require 'spec_helper'
 
 describe BambooService, models: true do
-  describe "Associations" do
+  describe 'Associations' do
     it { is_expected.to belong_to :project }
     it { is_expected.to have_one :service_hook }
   end
 
-  describe "Execute" do
-    let(:user)    { create(:user) }
-    let(:project) { create(:project) }
-
-    context "when a password was previously set" do
-      before do
-        @bamboo_service = BambooService.create(
-          project: create(:project),
-          properties: {
-            bamboo_url: 'http://gitlab.com',
-            username: 'mic',
-            password: "password"
-          }
-        )
+  describe 'Validations' do
+    describe '#bamboo_url' do
+      it 'does not validate the presence of bamboo_url if service is not active' do
+        bamboo_service = service
+        bamboo_service.active = false
+
+        expect(bamboo_service).not_to validate_presence_of(:bamboo_url)
+      end
+
+      it 'validates the presence of bamboo_url if service is active' do
+        bamboo_service = service
+        bamboo_service.active = true
+
+        expect(bamboo_service).to validate_presence_of(:bamboo_url)
+      end
+    end
+
+    describe '#build_key' do
+      it 'does not validate the presence of build_key if service is not active' do
+        bamboo_service = service
+        bamboo_service.active = false
+
+        expect(bamboo_service).not_to validate_presence_of(:build_key)
       end
-  
-      it "reset password if url changed" do
-        @bamboo_service.bamboo_url = 'http://gitlab1.com'
-        @bamboo_service.save
-        expect(@bamboo_service.password).to be_nil
+
+      it 'validates the presence of build_key if service is active' do
+        bamboo_service = service
+        bamboo_service.active = true
+
+        expect(bamboo_service).to validate_presence_of(:build_key)
+      end
+    end
+
+    describe '#username' do
+      it 'does not validate the presence of username if service is not active' do
+        bamboo_service = service
+        bamboo_service.active = false
+
+        expect(bamboo_service).not_to validate_presence_of(:username)
+      end
+
+      it 'does not validate the presence of username if username is nil' do
+        bamboo_service = service
+        bamboo_service.active = true
+        bamboo_service.password = nil
+
+        expect(bamboo_service).not_to validate_presence_of(:username)
+      end
+
+      it 'validates the presence of username if service is active and username is present' do
+        bamboo_service = service
+        bamboo_service.active = true
+        bamboo_service.password = 'secret'
+
+        expect(bamboo_service).to validate_presence_of(:username)
       end
-  
-      it "does not reset password if username changed" do
-        @bamboo_service.username = "some_name"
-        @bamboo_service.save
-        expect(@bamboo_service.password).to eq("password")
+    end
+
+    describe '#password' do
+      it 'does not validate the presence of password if service is not active' do
+        bamboo_service = service
+        bamboo_service.active = false
+
+        expect(bamboo_service).not_to validate_presence_of(:password)
       end
 
-      it "does not reset password if new url is set together with password, even if it's the same password" do
-        @bamboo_service.bamboo_url = 'http://gitlab_edited.com'
-        @bamboo_service.password = 'password'
-        @bamboo_service.save
-        expect(@bamboo_service.password).to eq("password")
-        expect(@bamboo_service.bamboo_url).to eq("http://gitlab_edited.com")
+      it 'does not validate the presence of password if username is nil' do
+        bamboo_service = service
+        bamboo_service.active = true
+        bamboo_service.username = nil
+
+        expect(bamboo_service).not_to validate_presence_of(:password)
       end
 
-      it "should reset password if url changed, even if setter called multiple times" do
-        @bamboo_service.bamboo_url = 'http://gitlab1.com'
-        @bamboo_service.bamboo_url = 'http://gitlab1.com'
-        @bamboo_service.save
-        expect(@bamboo_service.password).to be_nil
+      it 'validates the presence of password if service is active and username is present' do
+        bamboo_service = service
+        bamboo_service.active = true
+        bamboo_service.username = 'john'
+
+        expect(bamboo_service).to validate_presence_of(:password)
       end
     end
-    
-    context "when no password was previously set" do
-      before do
-        @bamboo_service = BambooService.create(
-          project: create(:project),
-          properties: {
-            bamboo_url: 'http://gitlab.com',
-            username: 'mic'
-          }
-        )
+  end
+
+  describe 'Callbacks' do
+    describe 'before_update :reset_password' do
+      context 'when a password was previously set' do
+        it 'resets password if url changed' do
+          bamboo_service = service
+
+          bamboo_service.bamboo_url = 'http://gitlab1.com'
+          bamboo_service.save
+
+          expect(bamboo_service.password).to be_nil
+        end
+
+        it 'does not reset password if username changed' do
+          bamboo_service = service
+
+          bamboo_service.username = 'some_name'
+          bamboo_service.save
+
+          expect(bamboo_service.password).to eq('password')
+        end
+
+        it "does not reset password if new url is set together with password, even if it's the same password" do
+          bamboo_service = service
+
+          bamboo_service.bamboo_url = 'http://gitlab_edited.com'
+          bamboo_service.password = 'password'
+          bamboo_service.save
+
+          expect(bamboo_service.password).to eq('password')
+          expect(bamboo_service.bamboo_url).to eq('http://gitlab_edited.com')
+        end
       end
 
-      it "saves password if new url is set together with password" do
-        @bamboo_service.bamboo_url = 'http://gitlab_edited.com'
-        @bamboo_service.password = 'password'
-        @bamboo_service.save
-        expect(@bamboo_service.password).to eq("password")
-        expect(@bamboo_service.bamboo_url).to eq("http://gitlab_edited.com")
+      it 'saves password if new url is set together with password when no password was previously set' do
+        bamboo_service = service
+        bamboo_service.password = nil
+
+        bamboo_service.bamboo_url = 'http://gitlab_edited.com'
+        bamboo_service.password = 'password'
+        bamboo_service.save
+
+        expect(bamboo_service.password).to eq('password')
+        expect(bamboo_service.bamboo_url).to eq('http://gitlab_edited.com')
       end
+    end
+  end
+
+  describe '#build_page' do
+    it 'returns a specific URL when status is 500' do
+      stub_request(status: 500)
+
+      expect(service.build_page('123', 'unused')).to eq('http://gitlab.com/browse/foo')
+    end
+
+    it 'returns a specific URL when response has no results' do
+      stub_request(body: %Q({"results":{"results":{"size":"0"}}}))
+
+      expect(service.build_page('123', 'unused')).to eq('http://gitlab.com/browse/foo')
+    end
+
+    it 'returns a build URL when bamboo_url has no trailing slash' do
+      stub_request(body: %Q({"results":{"results":{"result":{"planResultKey":{"key":"42"}}}}}))
+
+      expect(service(bamboo_url: 'http://gitlab.com').build_page('123', 'unused')).to eq('http://gitlab.com/browse/42')
+    end
+
+    it 'returns a build URL when bamboo_url has a trailing slash' do
+      stub_request(body: %Q({"results":{"results":{"result":{"planResultKey":{"key":"42"}}}}}))
+
+      expect(service(bamboo_url: 'http://gitlab.com/').build_page('123', 'unused')).to eq('http://gitlab.com/browse/42')
+    end
+  end
+
+  describe '#commit_status' do
+    it 'sets commit status to :error when status is 500' do
+      stub_request(status: 500)
+
+      expect(service.commit_status('123', 'unused')).to eq(:error)
+    end
+
+    it 'sets commit status to "pending" when status is 404' do
+      stub_request(status: 404)
+
+      expect(service.commit_status('123', 'unused')).to eq('pending')
+    end
+
+    it 'sets commit status to "pending" when response has no results' do
+      stub_request(body: %Q({"results":{"results":{"size":"0"}}}))
+
+      expect(service.commit_status('123', 'unused')).to eq('pending')
+    end
+
+    it 'sets commit status to "success" when build state contains Success' do
+      stub_request(build_state: 'YAY Success!')
 
+      expect(service.commit_status('123', 'unused')).to eq('success')
     end
+
+    it 'sets commit status to "failed" when build state contains Failed' do
+      stub_request(build_state: 'NO Failed!')
+
+      expect(service.commit_status('123', 'unused')).to eq('failed')
+    end
+
+    it 'sets commit status to "pending" when build state contains Pending' do
+      stub_request(build_state: 'NO Pending!')
+
+      expect(service.commit_status('123', 'unused')).to eq('pending')
+    end
+
+    it 'sets commit status to :error when build state is unknown' do
+      stub_request(build_state: 'FOO BAR!')
+
+      expect(service.commit_status('123', 'unused')).to eq(:error)
+    end
+  end
+
+  def service(bamboo_url: 'http://gitlab.com')
+    described_class.create(
+      project: build_stubbed(:empty_project),
+      properties: {
+        bamboo_url: bamboo_url,
+        username: 'mic',
+        password: 'password',
+        build_key: 'foo'
+      }
+    )
+  end
+
+  def stub_request(status: 200, body: nil, build_state: 'success')
+    bamboo_full_url = 'http://mic:password@gitlab.com/rest/api/latest/result?label=123&os_authType=basic'
+    body ||= %Q({"results":{"results":{"result":{"buildState":"#{build_state}"}}}})
+
+    WebMock.stub_request(:get, bamboo_full_url).to_return(
+      status: status,
+      headers: { 'Content-Type' => 'application/json' },
+      body: body
+    )
   end
 end
-- 
cgit v1.2.1


From 2fd05aed463684203cf21923b54e28888fcad0ea Mon Sep 17 00:00:00 2001
From: Frank Groeneveld <frank@frankgroeneveld.nl>
Date: Thu, 14 Apr 2016 10:24:09 +0200
Subject: Allow empty recipient list when pusher is added

Closes #13574
---
 .../project_services/builds_email_service_spec.rb  | 37 ++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

(limited to 'spec/models')

diff --git a/spec/models/project_services/builds_email_service_spec.rb b/spec/models/project_services/builds_email_service_spec.rb
index 2ccbff553f0..7c23c2efccd 100644
--- a/spec/models/project_services/builds_email_service_spec.rb
+++ b/spec/models/project_services/builds_email_service_spec.rb
@@ -3,9 +3,10 @@ require 'spec_helper'
 describe BuildsEmailService do
   let(:build) { create(:ci_build) }
   let(:data) { Gitlab::BuildDataBuilder.build(build) }
-  let(:service) { BuildsEmailService.new }
+  let!(:project) { create(:project, :public, ci_id: 1) }
+  let(:service) { described_class.new(project: project, active: true) }
 
-  describe :execute do
+  describe '#execute' do
     it 'sends email' do
       service.recipients = 'test@gitlab.com'
       data[:build_status] = 'failed'
@@ -40,4 +41,36 @@ describe BuildsEmailService do
       service.execute(data)
     end
   end
+
+  describe 'validations' do
+
+    context 'when pusher is not added' do
+      before { service.add_pusher = false }
+
+      it 'does not allow empty recipient input' do
+        service.recipients = ''
+        expect(service.valid?).to be false
+      end
+
+      it 'does allow non-empty recipient input' do
+        service.recipients = 'test@example.com'
+        expect(service.valid?).to be true
+      end
+
+    end
+
+    context 'when pusher is added' do
+      before { service.add_pusher = true }
+
+      it 'does allow empty recipient input' do
+        service.recipients = ''
+        expect(service.valid?).to be true
+      end
+
+      it 'does allow non-empty recipient input' do
+        service.recipients = 'test@example.com'
+        expect(service.valid?).to be true
+      end
+    end
+  end
 end
-- 
cgit v1.2.1


From 0385cd5a585572be4d3b72797c14cad23efc48f5 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <zegerjan@gitlab.com>
Date: Wed, 13 Apr 2016 21:20:03 +0200
Subject: Start with iid on branch creation

---
 spec/models/issue_spec.rb | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'spec/models')

diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index 15052aaca28..fac516f9568 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -191,12 +191,19 @@ describe Issue, models: true do
   end
 
   describe '#related_branches' do
-    it "selects the right branches" do
+    it 'selects the right branches' do
       allow(subject.project.repository).to receive(:branch_names).
-        and_return(["mpempe", "#{subject.iid}mepmep", subject.to_branch_name])
+        and_return(['mpempe', "#{subject.iid}mepmep", subject.to_branch_name])
 
       expect(subject.related_branches).to eq([subject.to_branch_name])
     end
+
+    it 'excludes stable branches from the related branches' do
+      allow(subject.project.repository).to receive(:branch_names).
+        and_return(["#{subject.iid}-0-stable"])
+
+      expect(subject.related_branches).to eq []
+    end
   end
 
   it_behaves_like 'an editable mentionable' do
@@ -210,11 +217,11 @@ describe Issue, models: true do
     let(:subject) { create :issue }
   end
 
-  describe "#to_branch_name" do
+  describe '#to_branch_name' do
     let(:issue) { create(:issue, title: 'a' * 30) }
 
-    it "starts with the issue iid" do
-      expect(issue.to_branch_name).to match /-#{issue.iid}\z/
+    it 'starts with the issue iid' do
+      expect(issue.to_branch_name).to match /\A#{issue.iid}-a+\z/
     end
   end
 end
-- 
cgit v1.2.1


From f5ce601c2b052b18398d2207c64ce8828b628521 Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Fri, 15 Apr 2016 09:31:26 +0530
Subject: Make a few style changes based on MR feedback.

---
 spec/models/issue_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'spec/models')

diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index 202ce846dca..ed982d8a9d4 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -191,9 +191,9 @@ describe Issue, models: true do
   end
 
   describe '#related_branches' do
-    let(:user) { build(:user, :admin) }
+    let(:user) { build(:admin) }
 
-    before(:each) do
+    before do
       allow(subject.project.repository).to receive(:branch_names).
                                             and_return(["mpempe", "#{subject.iid}mepmep", subject.to_branch_name, "branch-#{subject.iid}"])
 
-- 
cgit v1.2.1


From 3c704c33e0d6c91ecc156d8bcdf260b0c4c23a27 Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Fri, 15 Apr 2016 14:21:28 +0200
Subject: Delete tags via rugged

---
 spec/models/repository_spec.rb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'spec/models')

diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index 86f68b3a0a0..c163001b7c1 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -770,11 +770,9 @@ describe Repository, models: true do
   describe '#rm_tag' do
     it 'removes a tag' do
       expect(repository).to receive(:before_remove_tag)
+      expect(repository.rugged.tags).to receive(:delete).with('v1.1.0')
 
-      expect_any_instance_of(Gitlab::Shell).to receive(:rm_tag).
-        with(repository.path_with_namespace, '8.5')
-
-      repository.rm_tag('8.5')
+      repository.rm_tag('v1.1.0')
     end
   end
 
-- 
cgit v1.2.1


From 0b1655e7b2e2aa57cb7ea8401743d709bf246074 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 16 Apr 2016 21:46:26 +0200
Subject: Rename CiStatus to Statusable

---
 spec/models/commit_spec.rb               |   8 +++
 spec/models/concerns/statuseable_spec.rb | 103 +++++++++++++++++++++++++++++++
 2 files changed, 111 insertions(+)
 create mode 100644 spec/models/concerns/statuseable_spec.rb

(limited to 'spec/models')

diff --git a/spec/models/commit_spec.rb b/spec/models/commit_spec.rb
index 0e9111c8029..ad47e338a33 100644
--- a/spec/models/commit_spec.rb
+++ b/spec/models/commit_spec.rb
@@ -163,4 +163,12 @@ eos
       it { expect(commit.reverts_commit?(another_commit)).to be_truthy }
     end
   end
+
+  describe '#ci_commits' do
+    # TODO: kamil
+  end
+
+  describe '#status' do
+    # TODO: kamil
+  end
 end
diff --git a/spec/models/concerns/statuseable_spec.rb b/spec/models/concerns/statuseable_spec.rb
new file mode 100644
index 00000000000..dacbd3034c0
--- /dev/null
+++ b/spec/models/concerns/statuseable_spec.rb
@@ -0,0 +1,103 @@
+require 'spec_helper'
+
+describe Statuseable do
+  before do
+    @object = Object.new
+    @object.extend(Statuseable::ClassMethods)
+  end
+
+  describe '.status' do
+    before do
+      allow(@object).to receive(:all).and_return(CommitStatus.where(id: statuses))
+    end
+
+    subject { @object.status }
+    
+    shared_examples 'build status summary' do
+      context 'all successful' do
+        let(:statuses) { Array.new(2) { create(type, status: :success) } }
+        it { is_expected.to eq 'success' }
+      end
+
+      context 'at least one failed' do
+        let(:statuses) do
+          [create(type, status: :success), create(type, status: :failed)]
+        end
+
+        it { is_expected.to eq 'failed' }
+      end
+
+      context 'at least one running' do
+        let(:statuses) do
+          [create(type, status: :success), create(type, status: :running)]
+        end
+
+        it { is_expected.to eq 'running' }
+      end
+
+      context 'at least one pending' do
+        let(:statuses) do
+          [create(type, status: :success), create(type, status: :pending)]
+        end
+
+        it { is_expected.to eq 'running' }
+      end
+
+      context 'success and failed but allowed to fail' do
+        let(:statuses) do
+          [create(type, status: :success),
+           create(type, status: :failed, allow_failure: true)]
+        end
+
+        it { is_expected.to eq 'success' }
+      end
+
+      context 'one failed but allowed to fail' do
+        let(:statuses) { [create(type, status: :failed, allow_failure: true)] }
+        it { is_expected.to eq 'success' }
+      end
+
+      context 'success and canceled' do
+        let(:statuses) do
+          [create(type, status: :success), create(type, status: :canceled)]
+        end
+        it { is_expected.to eq 'failed' }
+      end
+
+      context 'all canceled' do
+        let(:statuses) do
+          [create(type, status: :canceled), create(type, status: :canceled)]
+        end
+        it { is_expected.to eq 'canceled' }
+      end
+
+      context 'success and canceled but allowed to fail' do
+        let(:statuses) do
+          [create(type, status: :success),
+           create(type, status: :canceled, allow_failure: true)]
+        end
+
+        it { is_expected.to eq 'success' }
+      end
+
+      context 'one finished and second running but allowed to fail' do
+        let(:statuses) do
+          [create(type, status: :success),
+           create(type, status: :running, allow_failure: true)]
+        end
+
+        it { is_expected.to eq 'running' }
+      end
+    end
+
+    context 'ci build statuses' do
+      let(:type) { :ci_build }
+      it_behaves_like 'build status summary'
+    end
+
+    context 'generic commit statuses' do
+      let(:type) { :generic_commit_status }
+      it_behaves_like 'build status summary'
+    end
+  end
+end
-- 
cgit v1.2.1


From 1c5b172abb1279a25731d35ee913daa91738606d Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 16 Apr 2016 22:43:40 +0200
Subject: Write specs for this feature

---
 spec/models/ci/commit_spec.rb     | 71 +++++++++++++++++++++++++++++++++++++
 spec/models/commit_status_spec.rb | 74 +++++++++++++++++++++++++++++++++++++++
 spec/models/project_spec.rb       | 15 +++++++-
 3 files changed, 159 insertions(+), 1 deletion(-)

(limited to 'spec/models')

diff --git a/spec/models/ci/commit_spec.rb b/spec/models/ci/commit_spec.rb
index fb3b61ad7c7..aef4f007202 100644
--- a/spec/models/ci/commit_spec.rb
+++ b/spec/models/ci/commit_spec.rb
@@ -27,6 +27,8 @@ describe Ci::Commit, models: true do
   it { is_expected.to have_many(:trigger_requests) }
   it { is_expected.to have_many(:builds) }
   it { is_expected.to validate_presence_of :sha }
+  it { is_expected.to validate_presence_of :status }
+  it { is_expected.to delegate_method(:stages).to(:statuses) }
 
   it { is_expected.to respond_to :git_author_name }
   it { is_expected.to respond_to :git_author_email }
@@ -297,4 +299,73 @@ describe Ci::Commit, models: true do
       expect(commit.coverage).to be_nil
     end
   end
+
+  describe '#retryable?' do
+    subject { commit.retryable? }
+
+    context 'no failed builds' do
+      before do
+        FactoryGirl.create :ci_build, name: "rspec", commit: commit, status: 'success'
+      end
+
+      it 'be not retryable' do
+        is_expected.to be_falsey
+      end
+    end
+
+    context 'with failed builds' do
+      before do
+        FactoryGirl.create :ci_build, name: "rspec", commit: commit, status: 'running'
+        FactoryGirl.create :ci_build, name: "rubocop", commit: commit, status: 'failed'
+      end
+
+      it 'be retryable' do
+        is_expected.to be_truthy
+      end
+    end
+  end
+
+  describe '#stages' do
+    let(:commit2) { FactoryGirl.create :ci_commit, project: project }
+    subject { CommitStatus.where(commit: [commit, commit2]).stages }
+
+    before do
+      FactoryGirl.create :ci_build, commit: commit2, stage: 'test', stage_idx: 1
+      FactoryGirl.create :ci_build, commit: commit, stage: 'build', stage_idx: 0
+    end
+
+    it 'return all stages' do
+      is_expected.to eq(%w(build test))
+    end
+  end
+
+  describe '#update_state' do
+    it 'execute update_state after touching object' do
+      expect(commit).to receive(:update_state).and_return(true)
+      commit.touch
+    end
+
+    context 'dependent objects' do
+      let(:commit_status) { build :commit_status, commit: commit }
+
+      it 'execute update_state after saving dependent object' do
+        expect(commit).to receive(:update_state).and_return(true)
+        commit_status.save
+      end
+    end
+
+    context 'update state' do
+      let(:build) { FactoryGirl.create :ci_build, :success, commit: commit, started_at: Time.now - 120, finished_at: Time.now - 60 }
+
+      before do
+        build
+      end
+
+      [:status, :started_at, :finished_at, :duration].each do |param|
+        it "update #{param}" do
+          expect(commit.send(param)).to eq(build.send(param))
+        end
+      end
+    end
+  end
 end
diff --git a/spec/models/commit_status_spec.rb b/spec/models/commit_status_spec.rb
index 1c64947f1f5..31d546820c2 100644
--- a/spec/models/commit_status_spec.rb
+++ b/spec/models/commit_status_spec.rb
@@ -182,4 +182,78 @@ describe CommitStatus, models: true do
       is_expected.to eq([@commit1, @commit2])
     end
   end
+
+  describe '#before_sha' do
+    subject { commit_status.before_sha }
+
+    context 'when no before_sha is set for ci::commit' do
+      before { commit.before_sha = nil }
+
+      it 'return blank sha' do
+        is_expected.to eq(Gitlab::Git::BLANK_SHA)
+      end
+    end
+
+    context 'for before_sha set for ci::commit' do
+      let(:value) { '1234' }
+      before { commit.before_sha = value }
+
+      it 'return the set value' do
+        is_expected.to eq(value)
+      end
+    end
+  end
+
+  describe '#stages' do
+    before do
+      FactoryGirl.create :commit_status, commit: commit, stage: 'build', stage_idx: 0, status: 'success'
+      FactoryGirl.create :commit_status, commit: commit, stage: 'build', stage_idx: 0, status: 'failed'
+      FactoryGirl.create :commit_status, commit: commit, stage: 'deploy', stage_idx: 2, status: 'running'
+      FactoryGirl.create :commit_status, commit: commit, stage: 'test', stage_idx: 1, status: 'success'
+    end
+
+    context 'stages list' do
+      subject { CommitStatus.where(commit: commit).stages }
+
+      it 'return ordered list of stages' do
+        is_expected.to eq(%w(build test deploy))
+      end
+    end
+
+    context 'stages with statuses' do
+      subject { CommitStatus.where(commit: commit).stages_status }
+
+      it 'return list of stages with statuses' do
+        is_expected.to eq({
+          'build' => 'failed',
+          'test' => 'success',
+          'deploy' => 'running'
+        })
+      end
+    end
+  end
+
+  describe '#branch?' do
+    subject { commit_status.branch? }
+
+    context 'is not a tag' do
+      before do
+        commit_status.tag = false
+      end
+
+      it 'return true when tag is set to false' do
+        is_expected.to be_truthy
+      end
+    end
+
+    context 'is not a tag' do
+      before do
+        commit_status.tag = true
+      end
+
+      it 'return false when tag is set to true' do
+        is_expected.to be_falsey
+      end
+    end
+  end
 end
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 1688e91ca62..becc743de31 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -443,7 +443,20 @@ describe Project, models: true do
     let(:project) { create :project }
     let(:commit) { create :ci_commit, project: project, ref: 'master' }
 
-    it { expect(project.ci_commit(commit.sha, 'master')).to eq(commit) }
+    subject { project.ci_commit(commit.sha, 'master') }
+
+    it { is_expected.to eq(commit) }
+
+    context 'return latest' do
+      let(:commit2) { create :ci_commit, project: project, ref: 'master' }
+
+      before do
+        commit
+        commit2
+      end
+
+      it { is_expected.to eq(commit2) }
+    end
   end
 
   describe :builds_enabled do
-- 
cgit v1.2.1


From 3d6ba3b1076e68a67691d0e0de24ef97cc07f119 Mon Sep 17 00:00:00 2001
From: "P.S.V.R" <pmq2001@gmail.com>
Date: Mon, 18 Apr 2016 15:39:07 +0800
Subject: Add support to cherry-pick any commit

Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/12785
Merge Request: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3514
---
 spec/models/repository_spec.rb | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

(limited to 'spec/models')

diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index c163001b7c1..efd6da582b3 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -541,6 +541,41 @@ describe Repository, models: true do
     end
   end
 
+  describe '#cherry_pick' do
+    let(:conflict_commit) { repository.commit('c642fe9b8b9f28f9225d7ea953fe14e74748d53b') }
+    let(:pickable_commit) { repository.commit('7d3b0f7cff5f37573aea97cebfd5692ea1689924') }
+    let(:pickable_merge) { repository.commit('e56497bb5f03a90a51293fc6d516788730953899') }
+
+    context 'when there is a conflict' do
+      it 'should abort the operation' do
+        expect(repository.cherry_pick(user, conflict_commit, 'master')).to eq(false)
+      end
+    end
+
+    context 'when commit was already cherry-picked' do
+      it 'should abort the operation' do
+        repository.cherry_pick(user, pickable_commit, 'master')
+
+        expect(repository.cherry_pick(user, pickable_commit, 'master')).to eq(false)
+      end
+    end
+
+    context 'when commit can be cherry-picked' do
+      it 'should cherry-pick the changes' do
+        expect(repository.cherry_pick(user, pickable_commit, 'master')).to be_truthy
+      end
+    end
+
+    context 'cherry-picking a merge commit' do
+      it 'should cherry-pick the changes' do
+        expect(repository.blob_at_branch('master', 'foo/bar/.gitkeep')).to be_nil
+
+        repository.cherry_pick(user, pickable_merge, 'master')
+        expect(repository.blob_at_branch('master', 'foo/bar/.gitkeep')).not_to be_nil
+      end
+    end
+  end
+
   describe '#before_delete' do
     describe 'when a repository does not exist' do
       before do
-- 
cgit v1.2.1


From 651c3e841d6b0ca46edb6aa5cc62d42051a46d61 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Fri, 15 Apr 2016 12:14:27 +0200
Subject: Instrument Repository.clean_old_archives

---
 spec/models/repository_spec.rb | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

(limited to 'spec/models')

diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index c163001b7c1..f30a21e79ae 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -910,9 +910,32 @@ describe Repository, models: true do
     end
   end
 
+  describe '.clean_old_archives' do
+    let(:path) { Gitlab.config.gitlab.repository_downloads_path }
+
+    context 'when the downloads directory does not exist' do
+      it 'does not remove any archives' do
+        expect(File).to receive(:directory?).with(path).and_return(false)
+
+        expect(Gitlab::Popen).not_to receive(:popen)
+
+        described_class.clean_old_archives
+      end
+    end
+
+    context 'when the downloads directory exists' do
+      it 'removes old archives' do
+        expect(File).to receive(:directory?).with(path).and_return(true)
+
+        expect(Gitlab::Popen).to receive(:popen)
+
+        described_class.clean_old_archives
+      end
+    end
+  end
+
   def create_remote_branch(remote_name, branch_name, target)
     rugged = repository.rugged
     rugged.references.create("refs/remotes/#{remote_name}/#{branch_name}", target)
   end
-
 end
-- 
cgit v1.2.1


From a1363d39c6fe79d830dbce468c02880d2a5d7996 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 8 Apr 2016 11:02:26 +0200
Subject: Add `variables` keyword to job in CI config YAML

---
 spec/models/build_spec.rb | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'spec/models')

diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb
index b7457808040..ee44a4c5f12 100644
--- a/spec/models/build_spec.rb
+++ b/spec/models/build_spec.rb
@@ -238,6 +238,22 @@ describe Ci::Build, models: true do
 
           it { is_expected.to eq(predefined_variables + predefined_trigger_variable + yaml_variables + secure_variables + trigger_variables) }
         end
+
+        context 'when job variables are defined' do
+          before { build.update_attribute(:options, variables: job_variables) }
+
+          context 'when job variables are unique' do
+            let(:job_variables) { { KEY1: 'value1', KEY2: 'value2' } }
+            let(:resulting_variables) do
+              [{ key: :KEY1, value: 'value1', public: true },
+               { key: :KEY2, value: 'value2', public: true }]
+            end
+
+            it 'includes job variables' do
+              expect(subject).to include(*resulting_variables)
+            end
+          end
+        end
       end
     end
   end
-- 
cgit v1.2.1


From b578fbfb8572860490cdfd0163bfbf5f999bb1e6 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 11 Apr 2016 13:09:46 +0200
Subject: Make it possible to override build variables

---
 spec/models/build_spec.rb | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

(limited to 'spec/models')

diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb
index ee44a4c5f12..94d51435f37 100644
--- a/spec/models/build_spec.rb
+++ b/spec/models/build_spec.rb
@@ -240,17 +240,31 @@ describe Ci::Build, models: true do
         end
 
         context 'when job variables are defined' do
+          def result_variables
+            job_variables.map do |key, value|
+              { key: key, value: value, public: true }
+            end
+          end
+
           before { build.update_attribute(:options, variables: job_variables) }
 
           context 'when job variables are unique' do
             let(:job_variables) { { KEY1: 'value1', KEY2: 'value2' } }
-            let(:resulting_variables) do
-              [{ key: :KEY1, value: 'value1', public: true },
-               { key: :KEY2, value: 'value2', public: true }]
-            end
 
             it 'includes job variables' do
-              expect(subject).to include(*resulting_variables)
+              expect(subject).to include(*result_variables)
+            end
+          end
+
+          context 'when job variable has same key other variable has' do
+            let(:job_variables) { { CI_BUILD_NAME: 'overridden' } }
+
+            it 'contains job yaml variable' do
+              expect(subject).to include(*result_variables)
+            end
+
+            it 'contains only one variable with this key' do
+              expect(subject.count { |var| var[:key] == :CI_BUILD_NAME } ).to eq 1
             end
           end
         end
-- 
cgit v1.2.1


From b7946b50fc1b23b1974f7d0306c06f6d92cc8466 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 15 Apr 2016 12:18:46 +0200
Subject: Read job variables directly from gitlab CI config

---
 spec/models/build_spec.rb | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

(limited to 'spec/models')

diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb
index 94d51435f37..26a063de1e1 100644
--- a/spec/models/build_spec.rb
+++ b/spec/models/build_spec.rb
@@ -240,31 +240,27 @@ describe Ci::Build, models: true do
         end
 
         context 'when job variables are defined' do
-          def result_variables
-            job_variables.map do |key, value|
-              { key: key, value: value, public: true }
-            end
-          end
-
-          before { build.update_attribute(:options, variables: job_variables) }
-
           context 'when job variables are unique' do
-            let(:job_variables) { { KEY1: 'value1', KEY2: 'value2' } }
+            before { allow(build).to receive(:name) { 'staging' } }
 
             it 'includes job variables' do
-              expect(subject).to include(*result_variables)
+              expect(subject).to include(
+                { key: :KEY1, value: 'value1', public: true },
+                { key: :KEY2, value: 'value2', public: true }
+              )
             end
           end
 
           context 'when job variable has same key other variable has' do
-            let(:job_variables) { { CI_BUILD_NAME: 'overridden' } }
+            before { allow(build).to receive(:name) { 'production' } }
 
             it 'contains job yaml variable' do
-              expect(subject).to include(*result_variables)
+              expect(subject).to include(key: :DB_NAME, value: 'mysql',
+                                         public: true)
             end
 
             it 'contains only one variable with this key' do
-              expect(subject.count { |var| var[:key] == :CI_BUILD_NAME } ).to eq 1
+              expect(subject.count { |var| var[:key] == :DB_NAME } ).to eq 1
             end
           end
         end
-- 
cgit v1.2.1


From bdb06fa0437ebc1b03377d95763d1fefdcfd0441 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 15 Apr 2016 20:43:23 +0200
Subject: Improve build specs for job environment variables

---
 spec/models/build_spec.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'spec/models')

diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb
index 26a063de1e1..5ee40c22536 100644
--- a/spec/models/build_spec.rb
+++ b/spec/models/build_spec.rb
@@ -240,8 +240,11 @@ describe Ci::Build, models: true do
         end
 
         context 'when job variables are defined' do
+          ##
+          # Job-level variables are defined in gitlab_ci.yml fixture
+          #
           context 'when job variables are unique' do
-            before { allow(build).to receive(:name) { 'staging' } }
+            let(:build) { create(:ci_build, name: 'staging') }
 
             it 'includes job variables' do
               expect(subject).to include(
@@ -252,7 +255,7 @@ describe Ci::Build, models: true do
           end
 
           context 'when job variable has same key other variable has' do
-            before { allow(build).to receive(:name) { 'production' } }
+            let(:build) { create(:ci_build, name: 'production') }
 
             it 'contains job yaml variable' do
               expect(subject).to include(key: :DB_NAME, value: 'mysql',
-- 
cgit v1.2.1


From a6260b1eb7b4f30817d0cc5dbd80c860b5ed8a31 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Sat, 16 Apr 2016 20:21:01 +0200
Subject: Remove code that removes duplicate CI variables

At this point this is being handled by GitLab Runner and we need to
introduce this as a separate merge request.
---
 spec/models/build_spec.rb | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'spec/models')

diff --git a/spec/models/build_spec.rb b/spec/models/build_spec.rb
index 5ee40c22536..b5d356aa066 100644
--- a/spec/models/build_spec.rb
+++ b/spec/models/build_spec.rb
@@ -253,19 +253,6 @@ describe Ci::Build, models: true do
               )
             end
           end
-
-          context 'when job variable has same key other variable has' do
-            let(:build) { create(:ci_build, name: 'production') }
-
-            it 'contains job yaml variable' do
-              expect(subject).to include(key: :DB_NAME, value: 'mysql',
-                                         public: true)
-            end
-
-            it 'contains only one variable with this key' do
-              expect(subject.count { |var| var[:key] == :DB_NAME } ).to eq 1
-            end
-          end
         end
       end
     end
-- 
cgit v1.2.1


From 28ce41c00ebba5b60c69f75d9bce97c11210779a Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 18 Apr 2016 07:35:43 -0400
Subject: Fix tests

---
 spec/models/ci/commit_spec.rb     | 27 ++++++++++++++++++++++++++-
 spec/models/commit_status_spec.rb | 24 ------------------------
 2 files changed, 26 insertions(+), 25 deletions(-)

(limited to 'spec/models')

diff --git a/spec/models/ci/commit_spec.rb b/spec/models/ci/commit_spec.rb
index aef4f007202..c12327c2a77 100644
--- a/spec/models/ci/commit_spec.rb
+++ b/spec/models/ci/commit_spec.rb
@@ -355,7 +355,8 @@ describe Ci::Commit, models: true do
     end
 
     context 'update state' do
-      let(:build) { FactoryGirl.create :ci_build, :success, commit: commit, started_at: Time.now - 120, finished_at: Time.now - 60 }
+      let(:current) { Time.now.change(:usec => 0) }
+      let(:build) { FactoryGirl.create :ci_build, :success, commit: commit, started_at: current - 120, finished_at: current - 60 }
 
       before do
         build
@@ -368,4 +369,28 @@ describe Ci::Commit, models: true do
       end
     end
   end
+
+  describe '#branch?' do
+    subject { commit.branch? }
+
+    context 'is not a tag' do
+      before do
+        commit.tag = false
+      end
+
+      it 'return true when tag is set to false' do
+        is_expected.to be_truthy
+      end
+    end
+
+    context 'is not a tag' do
+      before do
+        commit.tag = true
+      end
+
+      it 'return false when tag is set to true' do
+        is_expected.to be_falsey
+      end
+    end
+  end
 end
diff --git a/spec/models/commit_status_spec.rb b/spec/models/commit_status_spec.rb
index 31d546820c2..971e6750375 100644
--- a/spec/models/commit_status_spec.rb
+++ b/spec/models/commit_status_spec.rb
@@ -232,28 +232,4 @@ describe CommitStatus, models: true do
       end
     end
   end
-
-  describe '#branch?' do
-    subject { commit_status.branch? }
-
-    context 'is not a tag' do
-      before do
-        commit_status.tag = false
-      end
-
-      it 'return true when tag is set to false' do
-        is_expected.to be_truthy
-      end
-    end
-
-    context 'is not a tag' do
-      before do
-        commit_status.tag = true
-      end
-
-      it 'return false when tag is set to true' do
-        is_expected.to be_falsey
-      end
-    end
-  end
 end
-- 
cgit v1.2.1


From e5ff37c1fcd384f417518c8cca6a2a2dcc3c2767 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 18 Apr 2016 07:45:23 -0400
Subject: Fix rubocop

---
 spec/models/ci/commit_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'spec/models')

diff --git a/spec/models/ci/commit_spec.rb b/spec/models/ci/commit_spec.rb
index c12327c2a77..82c18aaa01a 100644
--- a/spec/models/ci/commit_spec.rb
+++ b/spec/models/ci/commit_spec.rb
@@ -355,7 +355,7 @@ describe Ci::Commit, models: true do
     end
 
     context 'update state' do
-      let(:current) { Time.now.change(:usec => 0) }
+      let(:current) { Time.now.change(usec: 0) }
       let(:build) { FactoryGirl.create :ci_build, :success, commit: commit, started_at: current - 120, finished_at: current - 60 }
 
       before do
-- 
cgit v1.2.1


From 13804aba867d19009ca94d820aa7ec650a509f5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Mon, 11 Apr 2016 15:49:25 +0200
Subject: Continue implementation of the license template selector and
 /licenses API endpoint
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 spec/models/repository_spec.rb | 65 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 56 insertions(+), 9 deletions(-)

(limited to 'spec/models')

diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index f30a21e79ae..a374c505746 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -135,22 +135,69 @@ describe Repository, models: true do
 
   end
 
-  describe "#license" do
+  describe '#license_blob' do
     before do
-      repository.send(:cache).expire(:license)
+      repository.send(:cache).expire(:license_blob)
+      repository.remove_file(user, 'LICENSE', 'Remove LICENSE', 'master')
     end
 
-    it 'test selection preference' do
-      files = [TestBlob.new('file'), TestBlob.new('license'), TestBlob.new('copying')]
-      expect(repository.tree).to receive(:blobs).and_return(files)
+    it 'looks in the root_ref only' do
+      repository.remove_file(user, 'LICENSE', 'Remove LICENSE', 'markdown')
+      repository.commit_file(user, 'LICENSE', Licensee::License.new('mit').content, 'Add LICENSE', 'markdown', false)
+
+      expect(repository.license_blob).to be_nil
+    end
+
+    it 'favors license file with no extension' do
+      repository.commit_file(user, 'LICENSE', Licensee::License.new('mit').content, 'Add LICENSE', 'master', false)
+      repository.commit_file(user, 'LICENSE.md', Licensee::License.new('mit').content, 'Add LICENSE.md', 'master', false)
+
+      expect(repository.license_blob.name).to eq('LICENSE')
+    end
+
+    it 'favors .md file to .txt' do
+      repository.commit_file(user, 'LICENSE.md', Licensee::License.new('mit').content, 'Add LICENSE.md', 'master', false)
+      repository.commit_file(user, 'LICENSE.txt', Licensee::License.new('mit').content, 'Add LICENSE.txt', 'master', false)
+
+      expect(repository.license_blob.name).to eq('LICENSE.md')
+    end
+
+    it 'favors LICENCE to LICENSE' do
+      repository.commit_file(user, 'LICENSE', Licensee::License.new('mit').content, 'Add LICENSE', 'master', false)
+      repository.commit_file(user, 'LICENCE', Licensee::License.new('mit').content, 'Add LICENCE', 'master', false)
+
+      expect(repository.license_blob.name).to eq('LICENCE')
+    end
+
+    it 'favors LICENSE to COPYING' do
+      repository.commit_file(user, 'LICENSE', Licensee::License.new('mit').content, 'Add LICENSE', 'master', false)
+      repository.commit_file(user, 'COPYING', Licensee::License.new('mit').content, 'Add COPYING', 'master', false)
+
+      expect(repository.license_blob.name).to eq('LICENSE')
+    end
+
+    it 'favors LICENCE to COPYING' do
+      repository.commit_file(user, 'LICENCE', Licensee::License.new('mit').content, 'Add LICENCE', 'master', false)
+      repository.commit_file(user, 'COPYING', Licensee::License.new('mit').content, 'Add COPYING', 'master', false)
+
+      expect(repository.license_blob.name).to eq('LICENCE')
+    end
+  end
+
+  describe '#license_key' do
+    before do
+      repository.send(:cache).expire(:license_key)
+      repository.remove_file(user, 'LICENSE', 'Remove LICENSE', 'master')
+    end
 
-      expect(repository.license.name).to eq('license')
+    it 'returns "no-license" when no license is detected' do
+      expect(repository.license_key).to eq('no-license')
     end
 
-    it 'also accepts licence instead of license' do
-      expect(repository.tree).to receive(:blobs).and_return([TestBlob.new('licence')])
+    it 'returns the license key' do
+      repository.commit_file(user, 'LICENSE', Licensee::License.new('mit').content, 'Add LICENSE', 'master', false)
 
-      expect(repository.license.name).to eq('licence')
+      expect(repository.license_key).to eq('mit')
     end
   end
 
-- 
cgit v1.2.1


From f801e2243dcce6d3bdce01acf62fbf5a49a301da Mon Sep 17 00:00:00 2001
From: Timothy Andrew <mail@timothyandrew.net>
Date: Tue, 19 Apr 2016 09:22:55 +0530
Subject: A new branch created for a confidential issue is named
 `<id>-confidential-issue`.

---
 spec/models/issue_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'spec/models')

diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index da1c673653a..060e6599104 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -248,7 +248,7 @@ describe Issue, models: true do
 
     it "does not contain the issue title if confidential" do
       issue = create(:issue, title: 'testing-issue', confidential: true)
-      expect(issue.to_branch_name).to match /\Aissue/
+      expect(issue.to_branch_name).to match /confidential-issue\z/
     end
   end
 end
-- 
cgit v1.2.1


From b68e3925ffac4e8ffa376e25786c5dcaa915d75a Mon Sep 17 00:00:00 2001
From: Ben Bodenmiller <bbodenmiller@hotmail.com>
Date: Mon, 18 Apr 2016 23:32:02 -0700
Subject: format merge request references properly

---
 spec/models/project_services/hipchat_service_spec.rb             | 4 ++--
 spec/models/project_services/slack_service/merge_message_spec.rb | 4 ++--
 spec/models/project_services/slack_service/note_message_spec.rb  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'spec/models')

diff --git a/spec/models/project_services/hipchat_service_spec.rb b/spec/models/project_services/hipchat_service_spec.rb
index 91dd92b7c67..d878162a220 100644
--- a/spec/models/project_services/hipchat_service_spec.rb
+++ b/spec/models/project_services/hipchat_service_spec.rb
@@ -152,7 +152,7 @@ describe HipchatService, models: true do
 
         obj_attr = merge_sample_data[:object_attributes]
         expect(message).to eq("#{user.name} opened " \
-            "<a href=\"#{obj_attr[:url]}\">merge request ##{obj_attr["iid"]}</a> in " \
+            "<a href=\"#{obj_attr[:url]}\">merge request !#{obj_attr["iid"]}</a> in " \
             "<a href=\"#{project.web_url}\">#{project_name}</a>: " \
             "<b>Awesome merge request</b>" \
             "<pre>please fix</pre>")
@@ -202,7 +202,7 @@ describe HipchatService, models: true do
         title = data[:merge_request]['title']
 
         expect(message).to eq("#{user.name} commented on " \
-            "<a href=\"#{obj_attr[:url]}\">merge request ##{merge_id}</a> in " \
+            "<a href=\"#{obj_attr[:url]}\">merge request !#{merge_id}</a> in " \
             "<a href=\"#{project.web_url}\">#{project_name}</a>: " \
             "<b>#{title}</b>" \
             "<pre>merge request note</pre>")
diff --git a/spec/models/project_services/slack_service/merge_message_spec.rb b/spec/models/project_services/slack_service/merge_message_spec.rb
index dae8bd90922..224c7ceabe8 100644
--- a/spec/models/project_services/slack_service/merge_message_spec.rb
+++ b/spec/models/project_services/slack_service/merge_message_spec.rb
@@ -31,7 +31,7 @@ describe SlackService::MergeMessage, models: true do
   context 'open' do
     it 'returns a message regarding opening of merge requests' do
       expect(subject.pretext).to eq(
-        'Test User opened <somewhere.com/merge_requests/100|merge request #100> '\
+        'Test User opened <somewhere.com/merge_requests/100|merge request !100> '\
         'in <somewhere.com|project_name>: *Issue title*')
       expect(subject.attachments).to be_empty
     end
@@ -43,7 +43,7 @@ describe SlackService::MergeMessage, models: true do
     end
     it 'returns a message regarding closing of merge requests' do
       expect(subject.pretext).to eq(
-        'Test User closed <somewhere.com/merge_requests/100|merge request #100> '\
+        'Test User closed <somewhere.com/merge_requests/100|merge request !100> '\
         'in <somewhere.com|project_name>: *Issue title*')
       expect(subject.attachments).to be_empty
     end
diff --git a/spec/models/project_services/slack_service/note_message_spec.rb b/spec/models/project_services/slack_service/note_message_spec.rb
index 06006b9a4f5..d37590cab75 100644
--- a/spec/models/project_services/slack_service/note_message_spec.rb
+++ b/spec/models/project_services/slack_service/note_message_spec.rb
@@ -63,7 +63,7 @@ describe SlackService::NoteMessage, models: true do
     it 'returns a message regarding notes on a merge request' do
       message = SlackService::NoteMessage.new(@args)
       expect(message.pretext).to eq("Test User commented on " \
-      "<url|merge request #30> in <somewhere.com|project_name>: " \
+      "<url|merge request !30> in <somewhere.com|project_name>: " \
       "*merge request title*")
       expected_attachments =  [
           {
-- 
cgit v1.2.1


From 54661d3d44a7d98ed52680b074b2caed7aa33676 Mon Sep 17 00:00:00 2001
From: Sebastian Klier <sebastian@sebastianklier.com>
Date: Sun, 28 Feb 2016 15:26:52 +0800
Subject: add slack notifications for wiki pages

update changelog
---
 .../slack_service/wiki_page_message_spec.rb        | 56 ++++++++++++++++++++++
 spec/models/project_services/slack_service_spec.rb | 17 +++++++
 2 files changed, 73 insertions(+)
 create mode 100644 spec/models/project_services/slack_service/wiki_page_message_spec.rb

(limited to 'spec/models')

diff --git a/spec/models/project_services/slack_service/wiki_page_message_spec.rb b/spec/models/project_services/slack_service/wiki_page_message_spec.rb
new file mode 100644
index 00000000000..c272e0e0aac
--- /dev/null
+++ b/spec/models/project_services/slack_service/wiki_page_message_spec.rb
@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe SlackService::WikiPageMessage, models: true do
+  subject { SlackService::WikiPageMessage.new(args) }
+
+  let(:args) do
+    {
+      user: {
+        name: 'Test User',
+        username: 'Test User'
+      },
+      project_name: 'project_name',
+      project_url: 'somewhere.com',
+
+      object_attributes: {
+        title: 'Wiki page title',
+        url: 'url',
+        action: 'create',
+        content: 'Wiki page description'
+      }
+    }
+  end
+
+  let(:color) { '#345' }
+
+  context 'create' do
+    it 'returns a message regarding creation of pages' do
+      expect(subject.pretext).to eq(
+        'Test User created <url|wiki page> in <somewhere.com|project_name>: '\
+        '*Wiki page title*')
+      expect(subject.attachments).to eq([
+        {
+          text: "Wiki page description",
+          color: color,
+        }
+      ])
+    end
+  end
+
+  context 'update' do
+    before do
+      args[:object_attributes][:action] = 'update'
+    end
+    it 'returns a message regarding updating of pages' do
+      expect(subject.pretext). to eq(
+        'Test User edited <url|wiki page> in <somewhere.com|project_name>: '\
+        '*Wiki page title*')
+      expect(subject.attachments).to eq([
+        {
+          text: "Wiki page description",
+          color: color,
+        }
+      ])
+    end
+  end
+end
diff --git a/spec/models/project_services/slack_service_spec.rb b/spec/models/project_services/slack_service_spec.rb
index a9e0afad90f..478d59be08b 100644
--- a/spec/models/project_services/slack_service_spec.rb
+++ b/spec/models/project_services/slack_service_spec.rb
@@ -75,6 +75,17 @@ describe SlackService, models: true do
       @merge_request = merge_service.execute
       @merge_sample_data = merge_service.hook_data(@merge_request,
                                                    'open')
+
+      opts = {
+        title: "Awesome wiki_page",
+        content: "Some text describing some thing or another",
+        format: "md",
+        message: "user created page: Awesome wiki_page"
+      }
+
+      wiki_page_service = WikiPages::CreateService.new(project, user, opts)
+      @wiki_page = wiki_page_service.execute
+      @wiki_page_sample_data = wiki_page_service.hook_data(@wiki_page, 'create')
     end
 
     it "should call Slack API for push events" do
@@ -95,6 +106,12 @@ describe SlackService, models: true do
       expect(WebMock).to have_requested(:post, webhook_url).once
     end
 
+    it "should call Slack API for wiki page events" do
+      slack.execute(@wiki_page_sample_data)
+
+      expect(WebMock).to have_requested(:post, webhook_url).once
+    end
+
     it 'should use the username as an option for slack when configured' do
       allow(slack).to receive(:username).and_return(username)
       expect(Slack::Notifier).to receive(:new).
-- 
cgit v1.2.1


From d472810e49eaa0db0365e0f51227ef7f9cb8bcf5 Mon Sep 17 00:00:00 2001
From: Sebastian Klier <sebastian@sebastianklier.com>
Date: Tue, 5 Apr 2016 14:05:35 +0800
Subject: formatting and test structure

---
 .../slack_service/wiki_page_message_spec.rb        | 69 ++++++++++++++--------
 1 file changed, 43 insertions(+), 26 deletions(-)

(limited to 'spec/models')

diff --git a/spec/models/project_services/slack_service/wiki_page_message_spec.rb b/spec/models/project_services/slack_service/wiki_page_message_spec.rb
index c272e0e0aac..a2dfe1bf234 100644
--- a/spec/models/project_services/slack_service/wiki_page_message_spec.rb
+++ b/spec/models/project_services/slack_service/wiki_page_message_spec.rb
@@ -11,11 +11,9 @@ describe SlackService::WikiPageMessage, models: true do
       },
       project_name: 'project_name',
       project_url: 'somewhere.com',
-
       object_attributes: {
         title: 'Wiki page title',
         url: 'url',
-        action: 'create',
         content: 'Wiki page description'
       }
     }
@@ -23,34 +21,53 @@ describe SlackService::WikiPageMessage, models: true do
 
   let(:color) { '#345' }
 
-  context 'create' do
-    it 'returns a message regarding creation of pages' do
-      expect(subject.pretext).to eq(
-        'Test User created <url|wiki page> in <somewhere.com|project_name>: '\
-        '*Wiki page title*')
-      expect(subject.attachments).to eq([
-        {
-          text: "Wiki page description",
-          color: color,
-        }
-      ])
+  describe '#pretext' do
+    context 'when :action == "create"' do
+      before { args[:object_attributes][:action] = 'create' }
+
+      it do
+        expect(pretext).to eq(
+          'Test User created <url|wiki page> in <somewhere.com|project_name>: '\
+          '*Wiki page title*')
+      end
+    end
+
+    context 'when :action == "update"' do
+      before { args[:object_attributes][:action] = 'update' }
+
+      it do
+        expect(pretext).to eq(
+          'Test User edited <url|wiki page> in <somewhere.com|project_name>: '\
+          '*Wiki page title*')
+      end
     end
   end
 
-  context 'update' do
-    before do
-      args[:object_attributes][:action] = 'update'
+  describe '#attachments' do
+    context 'when :action == "create"' do
+      before { args[:object_attributes][:action] = 'create' }
+
+      it do
+        expect(attachments).to eq([
+          {
+            text: "Wiki page description",
+            color: color,
+          }
+        ])
+      end
     end
-    it 'returns a message regarding updating of pages' do
-      expect(subject.pretext). to eq(
-        'Test User edited <url|wiki page> in <somewhere.com|project_name>: '\
-        '*Wiki page title*')
-      expect(subject.attachments).to eq([
-        {
-          text: "Wiki page description",
-          color: color,
-        }
-      ])
+
+    context 'when :action == "update"' do
+      before { args[:object_attributes][:action] = 'update' }
+
+      it do
+        expect(attachments).to eq([
+          {
+            text: "Wiki page description",
+            color: color,
+          }
+        ])
+      end
     end
   end
 end
-- 
cgit v1.2.1


From 39a545d2a830ae69e75716b572fe88d86f85d084 Mon Sep 17 00:00:00 2001
From: Sebastian Klier <sebastian@sebastianklier.com>
Date: Tue, 5 Apr 2016 15:48:33 +0800
Subject: Fix test

---
 .../project_services/slack_service/wiki_page_message_spec.rb      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'spec/models')

diff --git a/spec/models/project_services/slack_service/wiki_page_message_spec.rb b/spec/models/project_services/slack_service/wiki_page_message_spec.rb
index a2dfe1bf234..2688b179c7b 100644
--- a/spec/models/project_services/slack_service/wiki_page_message_spec.rb
+++ b/spec/models/project_services/slack_service/wiki_page_message_spec.rb
@@ -26,7 +26,7 @@ describe SlackService::WikiPageMessage, models: true do
       before { args[:object_attributes][:action] = 'create' }
 
       it do
-        expect(pretext).to eq(
+        expect(subject.pretext).to eq(
           'Test User created <url|wiki page> in <somewhere.com|project_name>: '\
           '*Wiki page title*')
       end
@@ -36,7 +36,7 @@ describe SlackService::WikiPageMessage, models: true do
       before { args[:object_attributes][:action] = 'update' }
 
       it do
-        expect(pretext).to eq(
+        expect(subject.pretext).to eq(
           'Test User edited <url|wiki page> in <somewhere.com|project_name>: '\
           '*Wiki page title*')
       end
@@ -48,7 +48,7 @@ describe SlackService::WikiPageMessage, models: true do
       before { args[:object_attributes][:action] = 'create' }
 
       it do
-        expect(attachments).to eq([
+        expect(subject.attachments).to eq([
           {
             text: "Wiki page description",
             color: color,
@@ -61,7 +61,7 @@ describe SlackService::WikiPageMessage, models: true do
       before { args[:object_attributes][:action] = 'update' }
 
       it do
-        expect(attachments).to eq([
+        expect(subject.attachments).to eq([
           {
             text: "Wiki page description",
             color: color,
-- 
cgit v1.2.1


From 26df51dc2e244d9b1e5a712816bb7086f10b2259 Mon Sep 17 00:00:00 2001
From: Sebastian Klier <sebastian@sebastianklier.com>
Date: Thu, 14 Apr 2016 12:53:26 +0800
Subject: Fix test to conform to conventions

---
 .../slack_service/wiki_page_message_spec.rb               | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'spec/models')

diff --git a/spec/models/project_services/slack_service/wiki_page_message_spec.rb b/spec/models/project_services/slack_service/wiki_page_message_spec.rb
index 2688b179c7b..6ecab645b49 100644
--- a/spec/models/project_services/slack_service/wiki_page_message_spec.rb
+++ b/spec/models/project_services/slack_service/wiki_page_message_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe SlackService::WikiPageMessage, models: true do
-  subject { SlackService::WikiPageMessage.new(args) }
+  subject { described_class.new(args) }
 
   let(:args) do
     {
@@ -19,13 +19,11 @@ describe SlackService::WikiPageMessage, models: true do
     }
   end
 
-  let(:color) { '#345' }
-
   describe '#pretext' do
     context 'when :action == "create"' do
       before { args[:object_attributes][:action] = 'create' }
 
-      it do
+      it 'returns a message that a new wiki page was created' do
         expect(subject.pretext).to eq(
           'Test User created <url|wiki page> in <somewhere.com|project_name>: '\
           '*Wiki page title*')
@@ -35,7 +33,7 @@ describe SlackService::WikiPageMessage, models: true do
     context 'when :action == "update"' do
       before { args[:object_attributes][:action] = 'update' }
 
-      it do
+      it 'returns a message that a wiki page was updated' do
         expect(subject.pretext).to eq(
           'Test User edited <url|wiki page> in <somewhere.com|project_name>: '\
           '*Wiki page title*')
@@ -44,10 +42,13 @@ describe SlackService::WikiPageMessage, models: true do
   end
 
   describe '#attachments' do
+    let(:color) { '#345' }
+
     context 'when :action == "create"' do
       before { args[:object_attributes][:action] = 'create' }
 
-      it do
+
+      it 'it returns the attachment for a new wiki page' do
         expect(subject.attachments).to eq([
           {
             text: "Wiki page description",
@@ -60,7 +61,7 @@ describe SlackService::WikiPageMessage, models: true do
     context 'when :action == "update"' do
       before { args[:object_attributes][:action] = 'update' }
 
-      it do
+      it 'it returns the attachment for an updated wiki page' do
         expect(subject.attachments).to eq([
           {
             text: "Wiki page description",
-- 
cgit v1.2.1


From af18cddddf4ecb402ac613ddcc1f313f6adb7aad Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Wed, 20 Apr 2016 10:56:28 +0200
Subject: udpated a few things based on MR feedback. Also added model spec

---
 spec/models/concerns/issuable_spec.rb | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

(limited to 'spec/models')

diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index b16ccc6e305..dc7a9a10893 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -212,4 +212,28 @@ describe Issue, "Issuable" do
       expect(issue.downvotes).to eq(1)
     end
   end
-end
+
+  describe ".with_label" do
+    let(:example_label) { 'test1' }
+    let(:example_labels) { ['test1', 'test2'] }
+
+    it 'finds issue with 1 label' do
+      setup_labels([example_label])
+
+      expect(Issue.with_label(example_label).count).to eq(1)
+    end
+
+    it 'finds issue with 2 labels' do
+      setup_labels(example_labels)
+
+      expect(Issue.with_label(example_labels).to_a.count).to eq(1)
+    end
+
+    def setup_labels(label_names)
+      labels = label_names.map do |label|
+        create(:label, project: issue.project, title: label)
+      end
+      issue.labels << labels
+    end
+  end
+end
\ No newline at end of file
-- 
cgit v1.2.1


From c0948396d1fd8bf4cbd187f33583b2f6db5d2178 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Wed, 20 Apr 2016 11:25:33 +0200
Subject: fix rubocop warning

---
 spec/models/concerns/issuable_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'spec/models')

diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index dc7a9a10893..6b61bbb2fab 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -220,13 +220,13 @@ describe Issue, "Issuable" do
     it 'finds issue with 1 label' do
       setup_labels([example_label])
 
-      expect(Issue.with_label(example_label).count).to eq(1)
+      expect(Issue.with_label(example_label).size).to eq(1)
     end
 
     it 'finds issue with 2 labels' do
       setup_labels(example_labels)
 
-      expect(Issue.with_label(example_labels).to_a.count).to eq(1)
+      expect(Issue.with_label(example_labels).to_a.size).to eq(1)
     end
 
     def setup_labels(label_names)
-- 
cgit v1.2.1


From 976593fa7fd657437c68ade72f2061260318e7a9 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Wed, 20 Apr 2016 11:50:07 +0200
Subject: final line missing

---
 spec/models/concerns/issuable_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'spec/models')

diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index 6b61bbb2fab..63a0a47e923 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -236,4 +236,4 @@ describe Issue, "Issuable" do
       issue.labels << labels
     end
   end
-end
\ No newline at end of file
+end
-- 
cgit v1.2.1


From 6865bc16f8974e80b1ae657d7330be30c12c21ad Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 21 Apr 2016 09:12:03 +0200
Subject: refactored specs, adding more scenarios

---
 spec/models/concerns/issuable_spec.rb | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

(limited to 'spec/models')

diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index 63a0a47e923..cf9c1cc1fba 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -217,16 +217,26 @@ describe Issue, "Issuable" do
     let(:example_label) { 'test1' }
     let(:example_labels) { ['test1', 'test2'] }
 
-    it 'finds issue with 1 label' do
+    before(:each) do
+      setup_other_issue
+    end
+
+    it 'finds the correct issue with 1 label' do
       setup_labels([example_label])
 
-      expect(Issue.with_label(example_label).size).to eq(1)
+      expect(Issue.with_label(example_label)).to eq([issue])
+    end
+
+    it 'finds the correct issue with 2 labels' do
+      setup_labels(example_labels)
+
+      expect(Issue.with_label(example_labels)).to eq([issue])
     end
 
-    it 'finds issue with 2 labels' do
+    it 'finds the correct issue with 1 of 2 labels' do
       setup_labels(example_labels)
 
-      expect(Issue.with_label(example_labels).to_a.size).to eq(1)
+      expect(Issue.with_label(example_label)).to eq([issue])
     end
 
     def setup_labels(label_names)
@@ -235,5 +245,10 @@ describe Issue, "Issuable" do
       end
       issue.labels << labels
     end
+
+    def setup_other_issue
+      issue2 = create(:issue)
+      issue2.labels << create(:label, project: issue2.project, title: 'other_label')
+    end
   end
 end
-- 
cgit v1.2.1


From b09b175def7c66487d4571d90f23f613d868f25c Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 21 Apr 2016 13:20:00 +0200
Subject: refactored specs based on feedback

---
 spec/models/concerns/issuable_spec.rb | 45 ++++++++++++++---------------------
 1 file changed, 18 insertions(+), 27 deletions(-)

(limited to 'spec/models')

diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index cf9c1cc1fba..4a4cd093435 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -214,41 +214,32 @@ describe Issue, "Issuable" do
   end
 
   describe ".with_label" do
-    let(:example_label) { 'test1' }
-    let(:example_labels) { ['test1', 'test2'] }
+    let(:project) { create(:project, :public) }
+    let(:bug) { create(:label, project: project, title: 'bug') }
+    let(:feature) { create(:label, project: project, title: 'feature') }
+    let(:enhancement) { create(:label, project: project, title: 'enhancement') }
+    let(:issue1) { create(:issue, title: "Bugfix1", project: project) }
+    let(:issue2) { create(:issue, title: "Bugfix2", project: project) }
+    let(:issue3) { create(:issue, title: "Feature1", project: project) }
 
     before(:each) do
-      setup_other_issue
+      issue1.labels << bug
+      issue1.labels << feature
+      issue2.labels << bug
+      issue2.labels << enhancement
+      issue3.labels << feature
     end
 
-    it 'finds the correct issue with 1 label' do
-      setup_labels([example_label])
-
-      expect(Issue.with_label(example_label)).to eq([issue])
-    end
-
-    it 'finds the correct issue with 2 labels' do
-      setup_labels(example_labels)
-
-      expect(Issue.with_label(example_labels)).to eq([issue])
+    it 'finds the correct issue containing just enhancement label' do
+      expect(Issue.with_label(enhancement.title)).to match_array([issue2])
     end
 
-    it 'finds the correct issue with 1 of 2 labels' do
-      setup_labels(example_labels)
-
-      expect(Issue.with_label(example_label)).to eq([issue])
-    end
-
-    def setup_labels(label_names)
-      labels = label_names.map do |label|
-        create(:label, project: issue.project, title: label)
-      end
-      issue.labels << labels
+    it 'finds the correct issues containing the same label' do
+      expect(Issue.with_label(bug.title)).to match_array([issue1, issue2])
     end
 
-    def setup_other_issue
-      issue2 = create(:issue)
-      issue2.labels << create(:label, project: issue2.project, title: 'other_label')
+    it 'finds the correct issues containing only both labels' do
+      expect(Issue.with_label([bug.title, enhancement.title])).to match_array([issue2])
     end
   end
 end
-- 
cgit v1.2.1


From b8c4a65da7d6551f7c916426ec911fe7199b04cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Fri, 22 Apr 2016 15:03:54 +0200
Subject: Fix license detection to detect all license files, not only known
 licenses
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #15470.

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 spec/models/repository_spec.rb | 46 ++++++++++++++----------------------------
 1 file changed, 15 insertions(+), 31 deletions(-)

(limited to 'spec/models')

diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index b561aa663d1..c19524a01f8 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -132,7 +132,6 @@ describe Repository, models: true do
         it { expect(subject.basename).to eq('a/b/c') }
       end
     end
-
   end
 
   describe '#license_blob' do
@@ -148,39 +147,18 @@ describe Repository, models: true do
       expect(repository.license_blob).to be_nil
     end
 
-    it 'favors license file with no extension' do
-      repository.commit_file(user, 'LICENSE', Licensee::License.new('mit').content, 'Add LICENSE', 'master', false)
-      repository.commit_file(user, 'LICENSE.md', Licensee::License.new('mit').content, 'Add LICENSE.md', 'master', false)
-
-      expect(repository.license_blob.name).to eq('LICENSE')
-    end
-
-    it 'favors .md file to .txt' do
-      repository.commit_file(user, 'LICENSE.md', Licensee::License.new('mit').content, 'Add LICENSE.md', 'master', false)
-      repository.commit_file(user, 'LICENSE.txt', Licensee::License.new('mit').content, 'Add LICENSE.txt', 'master', false)
-
-      expect(repository.license_blob.name).to eq('LICENSE.md')
-    end
-
-    it 'favors LICENCE to LICENSE' do
-      repository.commit_file(user, 'LICENSE', Licensee::License.new('mit').content, 'Add LICENSE', 'master', false)
-      repository.commit_file(user, 'LICENCE', Licensee::License.new('mit').content, 'Add LICENCE', 'master', false)
-
-      expect(repository.license_blob.name).to eq('LICENCE')
-    end
-
-    it 'favors LICENSE to COPYING' do
-      repository.commit_file(user, 'LICENSE', Licensee::License.new('mit').content, 'Add LICENSE', 'master', false)
-      repository.commit_file(user, 'COPYING', Licensee::License.new('mit').content, 'Add COPYING', 'master', false)
+    it 'detects license file with no recognizable open-source license content' do
+      repository.commit_file(user, 'LICENSE', 'Copyright!', 'Add LICENSE', 'master', false)
 
       expect(repository.license_blob.name).to eq('LICENSE')
     end
 
-    it 'favors LICENCE to COPYING' do
-      repository.commit_file(user, 'LICENCE', Licensee::License.new('mit').content, 'Add LICENCE', 'master', false)
-      repository.commit_file(user, 'COPYING', Licensee::License.new('mit').content, 'Add COPYING', 'master', false)
+    %w[LICENSE LICENCE LiCensE LICENSE.md LICENSE.foo COPYING COPYING.md].each do |filename|
+      it "detects '#{filename}'" do
+        repository.commit_file(user, filename, Licensee::License.new('mit').content, "Add #{filename}", 'master', false)
 
-      expect(repository.license_blob.name).to eq('LICENCE')
+        expect(repository.license_blob.name).to eq(filename)
+      end
     end
   end
 
@@ -190,8 +168,14 @@ describe Repository, models: true do
       repository.remove_file(user, 'LICENSE', 'Remove LICENSE', 'master')
     end
 
-    it 'returns "no-license" when no license is detected' do
-      expect(repository.license_key).to eq('no-license')
+    it 'returns nil when no license is detected' do
+      expect(repository.license_key).to be_nil
+    end
+
+    it 'detects license file with no recognizable open-source license content' do
+      repository.commit_file(user, 'LICENSE', 'Copyright!', 'Add LICENSE', 'master', false)
+
+      expect(repository.license_key).to be_nil
     end
 
     it 'returns the license key' do
-- 
cgit v1.2.1


From 6dff1a9a2b1d4fb006f75bb941d9b68e4a01ba11 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Fri, 22 Apr 2016 00:39:31 -0700
Subject: Fix Error 500 due to stale cache when projects are renamed or
 transferred

Closes gitlab-org/gitlab-ee#506
---
 spec/models/project_spec.rb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'spec/models')

diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index becc743de31..e33c7d62ff4 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -719,11 +719,8 @@ describe Project, models: true do
         with('foo.wiki', project).
         and_return(wiki)
 
-      expect(repo).to receive(:expire_cache)
-      expect(repo).to receive(:expire_emptiness_caches)
-
-      expect(wiki).to receive(:expire_cache)
-      expect(wiki).to receive(:expire_emptiness_caches)
+      expect(repo).to receive(:before_delete)
+      expect(wiki).to receive(:before_delete)
 
       project.expire_caches_before_rename('foo')
     end
-- 
cgit v1.2.1


From 533cd8c2ee45cc0a34aca08f48f9ee0cf7d3c3fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Thu, 21 Apr 2016 09:42:08 +0200
Subject: Throttle the update of `project.last_activity_at` to 1 minute
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 spec/models/event_spec.rb | 65 +++++++++++++++++++++++++++++++----------------
 1 file changed, 43 insertions(+), 22 deletions(-)

(limited to 'spec/models')

diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb
index 89909c2bcd7..0c3cd13f399 100644
--- a/spec/models/event_spec.rb
+++ b/spec/models/event_spec.rb
@@ -30,32 +30,29 @@ describe Event, models: true do
     it { is_expected.to respond_to(:commits) }
   end
 
+  describe 'Callbacks' do
+    describe 'after_create :reset_project_activity' do
+      let(:project) { create(:project) }
+
+      context "project's last activity was less than 5 minutes ago" do
+        it 'does not update project.last_activity_at if it has been touched less than 5 minutes ago' do
+          create_event(project, project.owner)
+          project.update_column(:last_activity_at, 5.minutes.ago)
+          project_last_activity_at = project.last_activity_at
+
+          create_event(project, project.owner)
+
+          expect(project.last_activity_at).to eq(project_last_activity_at)
+        end
+      end
+    end
+  end
+
   describe "Push event" do
     before do
       project = create(:project)
       @user = project.owner
-
-      data = {
-        before: Gitlab::Git::BLANK_SHA,
-        after: "0220c11b9a3e6c69dc8fd35321254ca9a7b98f7e",
-        ref: "refs/heads/master",
-        user_id: @user.id,
-        user_name: @user.name,
-        repository: {
-          name: project.name,
-          url: "localhost/rubinius",
-          description: "",
-          homepage: "localhost/rubinius",
-          private: true
-        }
-      }
-
-      @event = Event.create(
-        project: project,
-        action: Event::PUSHED,
-        data: data,
-        author_id: @user.id
-      )
+      @event = create_event(project, @user)
     end
 
     it { expect(@event.push?).to be_truthy }
@@ -143,4 +140,28 @@ describe Event, models: true do
       it { is_expected.to eq([event2]) }
     end
   end
+
+  def create_event(project, user, attrs = {})
+    data = {
+      before: Gitlab::Git::BLANK_SHA,
+      after: "0220c11b9a3e6c69dc8fd35321254ca9a7b98f7e",
+      ref: "refs/heads/master",
+      user_id: user.id,
+      user_name: user.name,
+      repository: {
+        name: project.name,
+        url: "localhost/rubinius",
+        description: "",
+        homepage: "localhost/rubinius",
+        private: true
+      }
+    }
+
+    Event.create({
+      project: project,
+      action: Event::PUSHED,
+      data: data,
+      author_id: user.id
+    }.merge(attrs))
+  end
 end
-- 
cgit v1.2.1