summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-03-07 17:18:25 +0000
committerDouwe Maan <douwe@gitlab.com>2016-03-07 17:18:25 +0000
commit903aa7c95e82949ca0a7b18e1f6d2f25fe1b04f4 (patch)
tree312a87378af0a72c4e7c7bc40ca009ea4df70a20 /spec
parent99f08b3f727e9d155ab10ad285fe48e0279fb79e (diff)
parent95b06a62c0db5f8c285a1d24fa1994e10c70ff27 (diff)
downloadgitlab-ce-903aa7c95e82949ca0a7b18e1f6d2f25fe1b04f4.tar.gz
Merge branch 'issue_13621_2' into 'master'
Labels should be visible in dashboard and group milestone views Closes #13621 See merge request !2931
Diffstat (limited to 'spec')
-rw-r--r--spec/models/milestone_spec.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/models/milestone_spec.rb b/spec/models/milestone_spec.rb
index 1b1380ce4e2..28f13100d15 100644
--- a/spec/models/milestone_spec.rb
+++ b/spec/models/milestone_spec.rb
@@ -60,7 +60,7 @@ describe Milestone, models: true do
end
it "should recover from dividing by zero" do
- expect(milestone.issues).to receive(:count).and_return(0)
+ expect(milestone.issues).to receive(:size).and_return(0)
expect(milestone.percent_complete).to eq(0)
end
end
@@ -114,7 +114,6 @@ describe Milestone, models: true do
end
it { expect(milestone.closed_items_count).to eq(1) }
- it { expect(milestone.open_items_count).to eq(2) }
it { expect(milestone.total_items_count).to eq(3) }
it { expect(milestone.is_empty?).to be_falsey }
end