diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-11-09 22:48:03 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-11-09 22:48:03 +0000 |
| commit | bcba8b25975d87d31299ac6238c1bad6da323b61 (patch) | |
| tree | 60ab45c4ba07c187e3bb816c0686046a4ed15f30 | |
| parent | 66cddf34d3e554350acfe64aa1905334e977b259 (diff) | |
| parent | bf39c4bcdf64b656323a07e2f26079148f3a43c3 (diff) | |
| download | gitlab-ce-bcba8b25975d87d31299ac6238c1bad6da323b61.tar.gz | |
Merge branch '24341-fix-failure' into 'master'
Remove order-dependent expectation
Fixes #24341, hopefully
See merge request !7385
| -rw-r--r-- | spec/models/group_label_spec.rb | 2 | ||||
| -rw-r--r-- | spec/requests/api/labels_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/group_label_spec.rb b/spec/models/group_label_spec.rb index 85eb889225b..2369658bf78 100644 --- a/spec/models/group_label_spec.rb +++ b/spec/models/group_label_spec.rb @@ -18,7 +18,7 @@ describe GroupLabel, models: true do end describe '#to_reference' do - let(:label) { create(:group_label) } + let(:label) { create(:group_label, title: 'feature') } context 'using id' do it 'returns a String reference to the object' do diff --git a/spec/requests/api/labels_spec.rb b/spec/requests/api/labels_spec.rb index 2ff90b6deac..5d84976c9c3 100644 --- a/spec/requests/api/labels_spec.rb +++ b/spec/requests/api/labels_spec.rb @@ -15,7 +15,7 @@ describe API::API, api: true do describe 'GET /projects/:id/labels' do it 'returns all available labels to the project' do group = create(:group) - group_label = create(:group_label, group: group) + group_label = create(:group_label, title: 'feature', group: group) project.update(group: group) expected_keys = [ 'id', 'name', 'color', 'description', |