1 files changed, 68 insertions, 16 deletions
diff --git a/spec/controllers/admin/applications_controller_spec.rb b/spec/controllers/admin/applications_controller_spec.rb
index 6c423097e70..bf7707f177c 100644
--- a/spec/controllers/admin/applications_controller_spec.rb
+++ b/spec/controllers/admin/applications_controller_spec.rb
@@ -39,17 +39,43 @@ RSpec.describe Admin::ApplicationsController do
   end
 
   describe 'POST #create' do
-    it 'creates the application' do
-      create_params = attributes_for(:application, trusted: true, confidential: false, scopes: ['api'])
+    context 'with hash_oauth_secrets flag off' do
+      before do
+        stub_feature_flags(hash_oauth_secrets: false)
+      end
 
-      expect do
-        post :create, params: { doorkeeper_application: create_params }
-      end.to change { Doorkeeper::Application.count }.by(1)
+      it 'creates the application' do
+        create_params = attributes_for(:application, trusted: true, confidential: false, scopes: ['api'])
+
+        expect do
+          post :create, params: { 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(admin_application_path(application))
-      expect(application).to have_attributes(create_params.except(:uid, :owner_type))
+        expect(response).to redirect_to(admin_application_path(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 the application' do
+        create_params = attributes_for(:application, trusted: true, confidential: false, scopes: ['api'])
+
+        expect do
+          post :create, params: { 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
 
     it 'renders the application form on errors' do
@@ -62,17 +88,43 @@ RSpec.describe Admin::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: { 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: { doorkeeper_application: create_params }
+          end.to change { Doorkeeper::Application.count }.by(1)
 
-        expect(response).to redirect_to(admin_application_path(application))
-        expect(application).to have_attributes(create_params.except(:uid, :owner_type))
+          application = Doorkeeper::Application.last
+
+          expect(response).to redirect_to(admin_application_path(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: { 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