summaryrefslogtreecommitdiff
path: root/spec/models/concerns/issuable_spec.rb
diff options
context:
space:
mode:
Diffstat (limited to 'spec/models/concerns/issuable_spec.rb')
-rw-r--r--spec/models/concerns/issuable_spec.rb22
1 files changed, 19 insertions, 3 deletions
diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index 24908785320..74ee7a87b7b 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -102,6 +102,22 @@ describe Issuable do
end
end
+ describe '.any_label' do
+ let_it_be(:issue_with_label) { create(:labeled_issue, labels: [create(:label)]) }
+ let_it_be(:issue_with_multiple_labels) { create(:labeled_issue, labels: [create(:label), create(:label)]) }
+ let_it_be(:issue_without_label) { create(:issue) }
+
+ it 'returns an issuable with at least one label' do
+ expect(issuable_class.any_label).to match_array([issue_with_label, issue_with_multiple_labels])
+ end
+
+ context 'for custom sorting' do
+ it 'returns an issuable with at least one label' do
+ expect(issuable_class.any_label('created_at')).to eq([issue_with_label, issue_with_multiple_labels])
+ end
+ end
+ end
+
describe ".search" do
let!(:searchable_issue) { create(:issue, title: "Searchable awesome issue") }
let!(:searchable_issue2) { create(:issue, title: 'Aw') }
@@ -422,7 +438,7 @@ describe Issuable do
context 'total_time_spent is updated' do
before do
- issue.spend_time(duration: 2, user_id: user.id, spent_at: Time.now)
+ issue.spend_time(duration: 2, user_id: user.id, spent_at: Time.current)
issue.save
expect(Gitlab::HookData::IssuableBuilder)
.to receive(:new).with(issue).and_return(builder)
@@ -572,8 +588,8 @@ describe Issuable do
second_priority = create(:label, project: project, priority: 2)
no_priority = create(:label, project: project)
- first_milestone = create(:milestone, project: project, due_date: Time.now)
- second_milestone = create(:milestone, project: project, due_date: Time.now + 1.month)
+ first_milestone = create(:milestone, project: project, due_date: Time.current)
+ second_milestone = create(:milestone, project: project, due_date: Time.current + 1.month)
third_milestone = create(:milestone, project: project)
# The issues here are ordered by label priority, to ensure that we don't