1 files changed, 19 insertions, 12 deletions
diff --git a/spec/controllers/projects/labels_controller_spec.rb b/spec/controllers/projects/labels_controller_spec.rb
index 29251f49810..622ab154493 100644
--- a/spec/controllers/projects/labels_controller_spec.rb
+++ b/spec/controllers/projects/labels_controller_spec.rb
@@ -15,21 +15,28 @@ describe Projects::LabelsController do
     let!(:label_1) { create(:label, project: project, priority: 1, title: 'Label 1') }
     let!(:label_2) { create(:label, project: project, priority: 3, title: 'Label 2') }
     let!(:label_3) { create(:label, project: project, priority: 1, title: 'Label 3') }
-    let!(:label_4) { create(:label, project: project, priority: nil, title: 'Label 4') }
-    let!(:label_5) { create(:label, project: project, priority: nil, title: 'Label 5') }
+    let!(:label_4) { create(:label, project: project, title: 'Label 4') }
+    let!(:label_5) { create(:label, project: project, title: 'Label 5') }
 
-    let!(:group_label_1) { create(:group_label, group: group, priority: 3, title: 'Group Label 1') }
-    let!(:group_label_2) { create(:group_label, group: group, priority: 1, title: 'Group Label 2') }
-    let!(:group_label_3) { create(:group_label, group: group, priority: nil, title: 'Group Label 3') }
-    let!(:group_label_4) { create(:group_label, group: group, priority: nil, title: 'Group Label 4') }
+    let!(:group_label_1) { create(:group_label, group: group, title: 'Group Label 1') }
+    let!(:group_label_2) { create(:group_label, group: group, title: 'Group Label 2') }
+    let!(:group_label_3) { create(:group_label, group: group, title: 'Group Label 3') }
+    let!(:group_label_4) { create(:group_label, group: group, title: 'Group Label 4') }
+
+    before do
+      create(:label_priority, project: project, label: group_label_1, priority: 3)
+      create(:label_priority, project: project, label: group_label_2, priority: 1)
+    end
 
     context '@prioritized_labels' do
       before do
         list_labels
       end
 
-      it 'contains only prioritized labels' do
-        expect(assigns(:prioritized_labels)).to all(have_attributes(priority: a_value > 0))
+      it 'does not include labels without priority' do
+        list_labels
+
+        expect(assigns(:prioritized_labels)).not_to include(group_label_3, group_label_4, label_4, label_5)
       end
 
       it 'is sorted by priority, then label title' do
@@ -38,16 +45,16 @@ describe Projects::LabelsController do
     end
 
     context '@labels' do
-      it 'contains only unprioritized labels' do
+      it 'is sorted by label title' do
         list_labels
 
-        expect(assigns(:labels)).to all(have_attributes(priority: nil))
+        expect(assigns(:labels)).to eq [group_label_3, group_label_4, label_4, label_5]
       end
 
-      it 'is sorted by label title' do
+      it 'does not include labels with priority' do
         list_labels
 
-        expect(assigns(:labels)).to eq [group_label_3, group_label_4, label_4, label_5]
+        expect(assigns(:labels)).not_to include(group_label_2, label_1, label_3, group_label_1, label_2)
       end
 
       it 'does not include group labels when project does not belong to a group' do