Merge branch 'master' into awardables

2 files changed, 172 insertions, 0 deletions

diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index 86ad9de883f..568bf4c9324 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -202,4 +202,47 @@ describe Issue, "Issuable" do
         to eq({ 'Author' => 'Robert', 'Assignee' => 'Douwe' })
     end
   end
+
+  # TODO ZJ
+  describe "votes" do
+    before do
+      create!(:award_emoji, :upvote, awardable: issue)
+      create!(:award_emoji, :downvote, awardable: issue)
+    end
+
+    it "returns correct values" do
+      expect(issue.upvotes).to eq(1)
+      expect(issue.downvotes).to eq(1)
+    end
+  end
+
+  describe ".with_label" do
+    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
+      issue1.labels << bug
+      issue1.labels << feature
+      issue2.labels << bug
+      issue2.labels << enhancement
+      issue3.labels << feature
+    end
+
+    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 issues containing the same label' do
+      expect(Issue.with_label(bug.title)).to match_array([issue1, issue2])
+    end
+
+    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
diff --git a/spec/models/concerns/statuseable_spec.rb b/spec/models/concerns/statuseable_spec.rb
new file mode 100644
index 00000000000..8e0a2a2cbde
--- /dev/null
+++ b/spec/models/concerns/statuseable_spec.rb
@@ -0,0 +1,129 @@
+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 'canceled' }
+      end
+
+      context 'one failed and one canceled' do
+        let(:statuses) do
+          [create(type, status: :failed), create(type, status: :canceled)]
+        end
+
+        it { is_expected.to eq 'failed' }
+      end
+
+      context 'one failed but allowed to fail and one canceled' do
+        let(:statuses) do
+          [create(type, status: :failed, allow_failure: true),
+           create(type, status: :canceled)]
+        end
+
+        it { is_expected.to eq 'canceled' }
+      end
+
+      context 'one running one canceled' do
+        let(:statuses) do
+          [create(type, status: :running), create(type, status: :canceled)]
+        end
+
+        it { is_expected.to eq 'running' }
+      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