summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2016-12-01 10:33:51 +0000
committerRémy Coutable <remy@rymai.me>2016-12-01 10:33:51 +0000
commit7c66ea94ea563a0cd75819b00d7e544d32dee634 (patch)
tree1ba1ced5cfccffaa68e5673cf305efa21134855f /spec
parent1e518c04fbe90e480b60c0c4b7223ae0e937fa6f (diff)
parent9abcb71c9eec09d578a563dd80e3b430864faa54 (diff)
downloadgitlab-ce-7c66ea94ea563a0cd75819b00d7e544d32dee634.tar.gz
Merge branch 'remove-order-dependency-in-label-finder-spec' into 'master'
Remove an order dependency in LabelsFinder specs Makes the LabelsFinder spec expectations order-independent There is an explicit ordering to `LabelsFinder` - title ascending - but two of the labels (a group label and a project label) have the same title, so the sort ordering isn't stable for those in all circumstances. It looks like this is intentional. See merge request !7788
Diffstat (limited to 'spec')
-rw-r--r--spec/finders/labels_finder_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/finders/labels_finder_spec.rb b/spec/finders/labels_finder_spec.rb
index 9085cc8debf..1724cdba830 100644
--- a/spec/finders/labels_finder_spec.rb
+++ b/spec/finders/labels_finder_spec.rb
@@ -17,7 +17,7 @@ describe LabelsFinder do
let!(:project_label_4) { create(:label, project: project_4, title: 'Label 4') }
let!(:project_label_5) { create(:label, project: project_5, title: 'Label 5') }
- let!(:group_label_1) { create(:group_label, group: group_1, title: 'Label 1') }
+ let!(:group_label_1) { create(:group_label, group: group_1, title: 'Label 1 (group)') }
let!(:group_label_2) { create(:group_label, group: group_1, title: 'Group Label 2') }
let!(:group_label_3) { create(:group_label, group: group_2, title: 'Group Label 3') }