1 files changed, 68 insertions, 16 deletions
diff --git a/spec/controllers/groups/settings/applications_controller_spec.rb b/spec/controllers/groups/settings/applications_controller_spec.rb
index 0804a5536e0..b9457770ed6 100644
--- a/spec/controllers/groups/settings/applications_controller_spec.rb
+++ b/spec/controllers/groups/settings/applications_controller_spec.rb
@@ -71,17 +71,43 @@ RSpec.describe Groups::Settings::ApplicationsController do
         group.add_owner(user)
       end
 
-      it 'creates the application' do
-        create_params = attributes_for(:application, trusted: false, confidential: false, scopes: ['api'])
+      context 'with hash_oauth_secrets flag on' do
+        before do
+          stub_feature_flags(hash_oauth_secrets: true)
+        end
 
-        expect do
-          post :create, params: { group_id: group, doorkeeper_application: create_params }
-        end.to change { Doorkeeper::Application.count }.by(1)
+        it 'creates the application' do
+          create_params = attributes_for(:application, trusted: false, confidential: false, scopes: ['api'])
+
+          expect do
+            post :create, params: { group_id: group, doorkeeper_application: create_params }
+          end.to change { Doorkeeper::Application.count }.by(1)
 
-        application = Doorkeeper::Application.last
+          application = Doorkeeper::Application.last
 
-        expect(response).to redirect_to(group_settings_application_path(group, application))
-        expect(application).to have_attributes(create_params.except(:uid, :owner_type))
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(response).to render_template :show
+          expect(application).to have_attributes(create_params.except(:uid, :owner_type))
+        end
+      end
+
+      context 'with hash_oauth_secrets flag off' do
+        before do
+          stub_feature_flags(hash_oauth_secrets: false)
+        end
+
+        it 'creates the application' do
+          create_params = attributes_for(:application, trusted: false, confidential: false, scopes: ['api'])
+
+          expect do
+            post :create, params: { group_id: group, doorkeeper_application: create_params }
+          end.to change { Doorkeeper::Application.count }.by(1)
+
+          application = Doorkeeper::Application.last
+
+          expect(response).to redirect_to(group_settings_application_path(group, application))
+          expect(application).to have_attributes(create_params.except(:uid, :owner_type))
+        end
       end
 
       it 'renders the application form on errors' do
@@ -94,17 +120,43 @@ RSpec.describe Groups::Settings::ApplicationsController do
       end
 
       context 'when the params are for a confidential application' do
-        it 'creates a confidential application' do
-          create_params = attributes_for(:application, confidential: true, scopes: ['read_user'])
+        context 'with hash_oauth_secrets flag off' do
+          before do
+            stub_feature_flags(hash_oauth_secrets: false)
+          end
 
-          expect do
-            post :create, params: { group_id: group, doorkeeper_application: create_params }
-          end.to change { Doorkeeper::Application.count }.by(1)
+          it 'creates a confidential application' do
+            create_params = attributes_for(:application, confidential: true, scopes: ['read_user'])
 
-          application = Doorkeeper::Application.last
+            expect do
+              post :create, params: { group_id: group, doorkeeper_application: create_params }
+            end.to change { Doorkeeper::Application.count }.by(1)
 
-          expect(response).to redirect_to(group_settings_application_path(group, application))
-          expect(application).to have_attributes(create_params.except(:uid, :owner_type))
+            application = Doorkeeper::Application.last
+
+            expect(response).to redirect_to(group_settings_application_path(group, application))
+            expect(application).to have_attributes(create_params.except(:uid, :owner_type))
+          end
+        end
+
+        context 'with hash_oauth_secrets flag on' do
+          before do
+            stub_feature_flags(hash_oauth_secrets: true)
+          end
+
+          it 'creates a confidential application' do
+            create_params = attributes_for(:application, confidential: true, scopes: ['read_user'])
+
+            expect do
+              post :create, params: { group_id: group, doorkeeper_application: create_params }
+            end.to change { Doorkeeper::Application.count }.by(1)
+
+            application = Doorkeeper::Application.last
+
+            expect(response).to have_gitlab_http_status(:ok)
+            expect(response).to render_template :show
+            expect(application).to have_attributes(create_params.except(:uid, :owner_type))
+          end
         end
       end