Commit 738ceb3c authored by Shinya Maeda's avatar Shinya Maeda

Merge branch 'fix-ff-spec-name-sorting' into 'master'

Fix Feature Flag Controller Spec Sorting on Name

See merge request gitlab-org/gitlab!40908
parents fd690ac5 85a071f9
...@@ -62,11 +62,11 @@ RSpec.describe Projects::FeatureFlagsController do ...@@ -62,11 +62,11 @@ RSpec.describe Projects::FeatureFlagsController do
subject { get(:index, params: view_params, format: :json) } subject { get(:index, params: view_params, format: :json) }
let!(:feature_flag_active) do let!(:feature_flag_active) do
create(:operations_feature_flag, project: project, active: true) create(:operations_feature_flag, project: project, active: true, name: 'feature_flag_a')
end end
let!(:feature_flag_inactive) do let!(:feature_flag_inactive) do
create(:operations_feature_flag, project: project, active: false) create(:operations_feature_flag, project: project, active: false, name: 'feature_flag_b')
end end
it 'returns all feature flags as json response' do it 'returns all feature flags as json response' do
...@@ -219,7 +219,7 @@ RSpec.describe Projects::FeatureFlagsController do ...@@ -219,7 +219,7 @@ RSpec.describe Projects::FeatureFlagsController do
context 'with version 1 and 2 feature flags' do context 'with version 1 and 2 feature flags' do
let!(:new_version_feature_flag) do let!(:new_version_feature_flag) do
create(:operations_feature_flag, :new_version_flag, project: project) create(:operations_feature_flag, :new_version_flag, project: project, name: 'feature_flag_c')
end end
it 'returns all feature flags as json response' do it 'returns all feature flags as json response' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment