1 files changed, 5 insertions, 35 deletions
diff --git a/spec/requests/api/environments_spec.rb b/spec/requests/api/environments_spec.rb
index 6164555ad19..9a435b3bce9 100644
--- a/spec/requests/api/environments_spec.rb
+++ b/spec/requests/api/environments_spec.rb
@@ -72,30 +72,11 @@ RSpec.describe API::Environments, feature_category: :continuous_delivery do
         end
 
         context "when params[:search] is less than #{described_class::MIN_SEARCH_LENGTH} characters" do
-          before do
-            stub_feature_flags(environment_search_api_min_chars: false)
-          end
-
-          it 'returns a normal response' do
+          it 'returns with status 400' do
             get api("/projects/#{project.id}/environments?search=ab", user)
 
-            expect(response).to have_gitlab_http_status(:ok)
-            expect(response).to include_pagination_headers
-            expect(json_response).to be_an Array
-            expect(json_response.size).to eq(0)
-          end
-
-          context 'and environment_search_api_min_chars flag is enabled for the project' do
-            before do
-              stub_feature_flags(environment_search_api_min_chars: project)
-            end
-
-            it 'returns with status 400' do
-              get api("/projects/#{project.id}/environments?search=ab", user)
-
-              expect(response).to have_gitlab_http_status(:bad_request)
-              expect(json_response['message']).to include("Search query is less than #{described_class::MIN_SEARCH_LENGTH} characters")
-            end
+            expect(response).to have_gitlab_http_status(:bad_request)
+            expect(json_response['message']).to include("Search query is less than #{described_class::MIN_SEARCH_LENGTH} characters")
           end
         end
 
@@ -229,14 +210,13 @@ RSpec.describe API::Environments, feature_category: :continuous_delivery do
   end
 
   describe 'PUT /projects/:id/environments/:environment_id' do
-    it 'returns a 200 if name and external_url are changed' do
+    it 'returns a 200 if external_url is changed' do
       url = 'https://mepmep.whatever.ninja'
       put api("/projects/#{project.id}/environments/#{environment.id}", user),
-          params: { name: 'Mepmep', external_url: url }
+          params: { external_url: url }
 
       expect(response).to have_gitlab_http_status(:ok)
       expect(response).to match_response_schema('public_api/v4/environment')
-      expect(json_response['name']).to eq('Mepmep')
       expect(json_response['external_url']).to eq(url)
     end
 
@@ -258,16 +238,6 @@ RSpec.describe API::Environments, feature_category: :continuous_delivery do
       expect(json_response["error"]).to eq("slug is automatically generated and cannot be changed")
     end
 
-    it "won't update the external_url if only the name is passed" do
-      url = environment.external_url
-      put api("/projects/#{project.id}/environments/#{environment.id}", user),
-          params: { name: 'Mepmep' }
-
-      expect(response).to have_gitlab_http_status(:ok)
-      expect(json_response['name']).to eq('Mepmep')
-      expect(json_response['external_url']).to eq(url)
-    end
-
     it 'returns a 404 if the environment does not exist' do
       put api("/projects/#{project.id}/environments/#{non_existing_record_id}", user)