1 files changed, 11 insertions, 8 deletions
diff --git a/spec/support/shared_examples/requests/api/custom_attributes_shared_examples.rb b/spec/support/shared_examples/requests/api/custom_attributes_shared_examples.rb
index c9302f7b750..4e18804b937 100644
--- a/spec/support/shared_examples/requests/api/custom_attributes_shared_examples.rb
+++ b/spec/support/shared_examples/requests/api/custom_attributes_shared_examples.rb
@@ -3,21 +3,24 @@ shared_examples 'custom attributes endpoints' do |attributable_name|
   let!(:custom_attribute2) { attributable.custom_attributes.create key: 'bar', value: 'bar' }
 
   describe "GET /#{attributable_name} with custom attributes filter" do
-    let!(:other_attributable) { create attributable.class.name.underscore }
+    before do
+      other_attributable
+    end
 
     context 'with an unauthorized user' do
       it 'does not filter by custom attributes' do
         get api("/#{attributable_name}", user), custom_attributes: { foo: 'foo', bar: 'bar' }
 
-        expect(response).to have_http_status(200)
+        expect(response).to have_gitlab_http_status(200)
         expect(json_response.size).to be 2
+        expect(json_response.map { |r| r['id'] }).to contain_exactly attributable.id, other_attributable.id
       end
     end
 
     it 'filters by custom attributes' do
       get api("/#{attributable_name}", admin), custom_attributes: { foo: 'foo', bar: 'bar' }
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response.size).to be 1
       expect(json_response.first['id']).to eq attributable.id
     end
@@ -33,7 +36,7 @@ shared_examples 'custom attributes endpoints' do |attributable_name|
     it 'returns all custom attributes' do
       get api("/#{attributable_name}/#{attributable.id}/custom_attributes", admin)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to contain_exactly(
         { 'key' => 'foo', 'value' => 'foo' },
         { 'key' => 'bar', 'value' => 'bar' }
@@ -51,7 +54,7 @@ shared_examples 'custom attributes endpoints' do |attributable_name|
     it 'returns a single custom attribute' do
       get api("/#{attributable_name}/#{attributable.id}/custom_attributes/foo", admin)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to eq({ 'key' => 'foo', 'value' => 'foo' })
     end
   end
@@ -68,7 +71,7 @@ shared_examples 'custom attributes endpoints' do |attributable_name|
         put api("/#{attributable_name}/#{attributable.id}/custom_attributes/new", admin), value: 'new'
       end.to change { attributable.custom_attributes.count }.by(1)
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to eq({ 'key' => 'new', 'value' => 'new' })
       expect(attributable.custom_attributes.find_by(key: 'new').value).to eq 'new'
     end
@@ -78,7 +81,7 @@ shared_examples 'custom attributes endpoints' do |attributable_name|
         put api("/#{attributable_name}/#{attributable.id}/custom_attributes/foo", admin), value: 'new'
       end.not_to change { attributable.custom_attributes.count }
 
-      expect(response).to have_http_status(200)
+      expect(response).to have_gitlab_http_status(200)
       expect(json_response).to eq({ 'key' => 'foo', 'value' => 'new' })
       expect(custom_attribute1.reload.value).to eq 'new'
     end
@@ -96,7 +99,7 @@ shared_examples 'custom attributes endpoints' do |attributable_name|
         delete api("/#{attributable_name}/#{attributable.id}/custom_attributes/foo", admin)
       end.to change { attributable.custom_attributes.count }.by(-1)
 
-      expect(response).to have_http_status(204)
+      expect(response).to have_gitlab_http_status(204)
       expect(attributable.custom_attributes.find_by(key: 'foo')).to be_nil
     end
   end