diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-09 09:22:41 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-08-09 09:22:41 +0000 |
commit | 65688a509249eb3be8ea4687d3fe6d1432a47392 (patch) | |
tree | dffc9c087dc2eda02e4656d5a0b16b5d7051e69f /spec/controllers/jira_connect | |
parent | 4b8939db3d80469826a62f1409b921f96dac2498 (diff) | |
download | gitlab-ce-65688a509249eb3be8ea4687d3fe6d1432a47392.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers/jira_connect')
-rw-r--r-- | spec/controllers/jira_connect/app_descriptor_controller_spec.rb | 13 | ||||
-rw-r--r-- | spec/controllers/jira_connect/branches_controller_spec.rb | 12 |
2 files changed, 0 insertions, 25 deletions
diff --git a/spec/controllers/jira_connect/app_descriptor_controller_spec.rb b/spec/controllers/jira_connect/app_descriptor_controller_spec.rb index 4a914239622..98f4db13a1d 100644 --- a/spec/controllers/jira_connect/app_descriptor_controller_spec.rb +++ b/spec/controllers/jira_connect/app_descriptor_controller_spec.rb @@ -86,18 +86,5 @@ RSpec.describe JiraConnect::AppDescriptorController do ) ) end - - context 'when the jira_connect_create_branch feature is disabled' do - before do - stub_feature_flags(jira_connect_create_branch: false) - end - - it 'does not include the create branch action' do - get :show - - expect(response).to have_gitlab_http_status(:ok) - expect(descriptor[:modules][:jiraDevelopmentTool][:actions]).not_to include(:createBranch) - end - end end end diff --git a/spec/controllers/jira_connect/branches_controller_spec.rb b/spec/controllers/jira_connect/branches_controller_spec.rb index 31f68608918..45daf3b5309 100644 --- a/spec/controllers/jira_connect/branches_controller_spec.rb +++ b/spec/controllers/jira_connect/branches_controller_spec.rb @@ -34,18 +34,6 @@ RSpec.describe JiraConnect::BranchesController do expect(response).to be_successful expect(assigns(:new_branch_data)).to include('initial_branch_name': nil) end - - context 'when feature flag is disabled' do - before do - stub_feature_flags(jira_connect_create_branch: false) - end - - it 'renders a 404 error' do - get :new - - expect(response).to be_not_found - end - end end context 'when not logged in' do |