diff options
Diffstat (limited to 'spec/controllers')
7 files changed, 12 insertions, 51 deletions
diff --git a/spec/controllers/admin/clusters/applications_controller_spec.rb b/spec/controllers/admin/clusters/applications_controller_spec.rb index 2a77693061c..d1ca64d6bd2 100644 --- a/spec/controllers/admin/clusters/applications_controller_spec.rb +++ b/spec/controllers/admin/clusters/applications_controller_spec.rb @@ -22,7 +22,7 @@ RSpec.describe Admin::Clusters::ApplicationsController do post :create, params: params end - let(:application) { 'helm' } + let(:application) { 'ingress' } let(:params) { { application: application, id: cluster.id } } describe 'functionality' do @@ -37,7 +37,7 @@ RSpec.describe Admin::Clusters::ApplicationsController do expect { subject }.to change { current_application.count } expect(response).to have_gitlab_http_status(:no_content) - expect(cluster.application_helm).to be_scheduled + expect(cluster.application_ingress).to be_scheduled end context 'when cluster do not exists' do @@ -61,7 +61,7 @@ RSpec.describe Admin::Clusters::ApplicationsController do context 'when application is already installing' do before do - create(:clusters_applications_helm, :installing, cluster: cluster) + create(:clusters_applications_ingress, :installing, cluster: cluster) end it 'returns 400' do diff --git a/spec/controllers/dashboard_controller_spec.rb b/spec/controllers/dashboard_controller_spec.rb index 9b78f841cce..c838affa239 100644 --- a/spec/controllers/dashboard_controller_spec.rb +++ b/spec/controllers/dashboard_controller_spec.rb @@ -15,16 +15,6 @@ RSpec.describe DashboardController do describe 'GET issues' do it_behaves_like 'issuables list meta-data', :issue, :issues it_behaves_like 'issuables requiring filter', :issues - - it 'lists only incidents and issues' do - issue = create(:incident, project: project, author: user) - incident = create(:incident, project: project, author: user) - create(:quality_test_case, project: project, author: user) - - get :issues, params: { author_id: user.id } - - expect(assigns(:issues)).to match_array([issue, incident]) - end end describe 'GET merge requests' do diff --git a/spec/controllers/groups/clusters/applications_controller_spec.rb b/spec/controllers/groups/clusters/applications_controller_spec.rb index c1d170edce3..c3947c27399 100644 --- a/spec/controllers/groups/clusters/applications_controller_spec.rb +++ b/spec/controllers/groups/clusters/applications_controller_spec.rb @@ -28,7 +28,7 @@ RSpec.describe Groups::Clusters::ApplicationsController do post :create, params: params.merge(group_id: group) end - let(:application) { 'helm' } + let(:application) { 'ingress' } let(:params) { { application: application, id: cluster.id } } describe 'functionality' do @@ -44,7 +44,7 @@ RSpec.describe Groups::Clusters::ApplicationsController do expect { subject }.to change { current_application.count } expect(response).to have_gitlab_http_status(:no_content) - expect(cluster.application_helm).to be_scheduled + expect(cluster.application_ingress).to be_scheduled end context 'when cluster do not exists' do @@ -68,7 +68,7 @@ RSpec.describe Groups::Clusters::ApplicationsController do context 'when application is already installing' do before do - create(:clusters_applications_helm, :installing, cluster: cluster) + create(:clusters_applications_ingress, :installing, cluster: cluster) end it 'returns 400' do diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb index 55833ee3aad..90b38799629 100644 --- a/spec/controllers/groups_controller_spec.rb +++ b/spec/controllers/groups_controller_spec.rb @@ -400,15 +400,6 @@ RSpec.describe GroupsController, factory_default: :keep do sign_in(user) end - it 'lists only incidents and issues' do - incident = create(:incident, project: project) - create(:quality_test_case, project: project) - - get :issues, params: { id: group.to_param } - - expect(assigns(:issues)).to match_array([issue_1, issue_2, incident]) - end - context 'sorting by votes' do it 'sorts most popular issues' do get :issues, params: { id: group.to_param, sort: 'upvotes_desc' } diff --git a/spec/controllers/help_controller_spec.rb b/spec/controllers/help_controller_spec.rb index 9ac42cbc3ec..6927df3b1c7 100644 --- a/spec/controllers/help_controller_spec.rb +++ b/spec/controllers/help_controller_spec.rb @@ -101,7 +101,8 @@ RSpec.describe HelpController do context 'for Markdown formats' do context 'when requested file exists' do before do - expect(File).to receive(:read).and_return(fixture_file('blockquote_fence_after.md')) + expect_file_read(File.join(Rails.root, 'doc/ssh/README.md'), content: fixture_file('blockquote_fence_after.md')) + get :show, params: { path: 'ssh/README' }, format: :md end @@ -213,6 +214,6 @@ RSpec.describe HelpController do end def stub_readme(content) - expect(File).to receive(:read).and_return(content) + expect_file_read(Rails.root.join('doc', 'README.md'), content: content) end end diff --git a/spec/controllers/projects/clusters/applications_controller_spec.rb b/spec/controllers/projects/clusters/applications_controller_spec.rb index b50814b4790..cc6170252c1 100644 --- a/spec/controllers/projects/clusters/applications_controller_spec.rb +++ b/spec/controllers/projects/clusters/applications_controller_spec.rb @@ -32,7 +32,7 @@ RSpec.describe Projects::Clusters::ApplicationsController do let(:cluster) { create(:cluster, :project, :provided_by_gcp) } let(:project) { cluster.project } - let(:application) { 'helm' } + let(:application) { 'ingress' } let(:params) { { application: application, id: cluster.id } } describe 'functionality' do @@ -48,7 +48,7 @@ RSpec.describe Projects::Clusters::ApplicationsController do expect { subject }.to change { current_application.count } expect(response).to have_gitlab_http_status(:no_content) - expect(cluster.application_helm).to be_scheduled + expect(cluster.application_ingress).to be_scheduled end context 'when cluster do not exists' do @@ -72,7 +72,7 @@ RSpec.describe Projects::Clusters::ApplicationsController do context 'when application is already installing' do before do - create(:clusters_applications_helm, :installing, cluster: cluster) + create(:clusters_applications_ingress, :installing, cluster: cluster) end it 'returns 400' do diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb index 012a98f433e..ced590039e1 100644 --- a/spec/controllers/projects_controller_spec.rb +++ b/spec/controllers/projects_controller_spec.rb @@ -41,27 +41,6 @@ RSpec.describe ProjectsController do end end end - - context 'with the new_create_project_ui experiment enabled and the user is part of the control group' do - before do - stub_experiment(new_create_project_ui: true) - stub_experiment_for_user(new_create_project_ui: false) - allow_any_instance_of(described_class).to receive(:experimentation_subject_id).and_return('uuid') - end - - it 'passes the right tracking parameters to the frontend' do - get(:new) - - expect(Gon.tracking_data).to eq( - { - category: 'Manage::Import::Experiment::NewCreateProjectUi', - action: 'click_tab', - label: 'uuid', - property: 'control_group' - } - ) - end - end end end |