diff options
Diffstat (limited to 'spec')
6 files changed, 24 insertions, 73 deletions
diff --git a/spec/features/runners_spec.rb b/spec/features/runners_spec.rb index b61a769185e..22de77f7cd0 100644 --- a/spec/features/runners_spec.rb +++ b/spec/features/runners_spec.rb @@ -16,10 +16,10 @@ RSpec.describe 'Runners' do project.add_maintainer(user) end - it 'user can see a button to install runners on kubernetes clusters' do + it 'user can see a link with instructions on how to install GitLab Runner' do visit project_runners_path(project) - expect(page).to have_link('Install GitLab Runner on Kubernetes', href: project_clusters_path(project)) + expect(page).to have_link('Install GitLab Runner and ensure it\'s running.', href: "https://docs.gitlab.com/runner/install/") end end @@ -343,12 +343,6 @@ RSpec.describe 'Runners' do expect(page).to have_content 'No runners found' end - - it 'user can see a link to install runners on kubernetes clusters' do - visit group_settings_ci_cd_path(group) - - expect(page).to have_link('Install GitLab Runner on Kubernetes', href: group_clusters_path(group)) - end end context 'group with a runner' do diff --git a/spec/frontend/integrations/edit/components/integration_form_spec.js b/spec/frontend/integrations/edit/components/integration_form_spec.js index cbce26762b1..ff602327592 100644 --- a/spec/frontend/integrations/edit/components/integration_form_spec.js +++ b/spec/frontend/integrations/edit/components/integration_form_spec.js @@ -278,6 +278,7 @@ describe('IntegrationForm', () => { <svg class="gl-icon"> <use></use> </svg> + <a data-confirm="Are you sure?" data-method="delete" href="/settings/slack"></a> </div> `); @@ -291,9 +292,14 @@ describe('IntegrationForm', () => { }); const helpHtml = wrapper.findByTestId(mockTestId); + const helpLink = helpHtml.find('a'); expect(helpHtml.isVisible()).toBe(true); expect(helpHtml.find('svg').isVisible()).toBe(true); + expect(helpLink.attributes()).toMatchObject({ + 'data-confirm': 'Are you sure?', + 'data-method': 'delete', + }); }); }); }); diff --git a/spec/serializers/merge_request_poll_cached_widget_entity_spec.rb b/spec/serializers/merge_request_poll_cached_widget_entity_spec.rb index 5845a868e53..5f4b734fcea 100644 --- a/spec/serializers/merge_request_poll_cached_widget_entity_spec.rb +++ b/spec/serializers/merge_request_poll_cached_widget_entity_spec.rb @@ -302,16 +302,6 @@ RSpec.describe MergeRequestPollCachedWidgetEntity do expect(subject[:merge_pipeline]).to be_nil end end - - context 'when merge_request_cached_merge_pipeline_serializer is disabled' do - before do - stub_feature_flags(merge_request_cached_merge_pipeline_serializer: false) - end - - it 'returns nil' do - expect(subject[:merge_pipeline]).to be_nil - end - end end end diff --git a/spec/serializers/merge_request_poll_widget_entity_spec.rb b/spec/serializers/merge_request_poll_widget_entity_spec.rb index 9a0e25516cb..3aebe16438c 100644 --- a/spec/serializers/merge_request_poll_widget_entity_spec.rb +++ b/spec/serializers/merge_request_poll_widget_entity_spec.rb @@ -22,54 +22,6 @@ RSpec.describe MergeRequestPollWidgetEntity do .to eq(resource.default_merge_commit_message(include_description: true)) end - describe 'merge_pipeline' do - before do - stub_feature_flags(merge_request_cached_merge_pipeline_serializer: false) - end - - it 'returns nil' do - expect(subject[:merge_pipeline]).to be_nil - end - - context 'when is merged' do - let_it_be(:resource) { create(:merged_merge_request, source_project: project, merge_commit_sha: project.commit.id) } - let_it_be(:pipeline) { create(:ci_empty_pipeline, project: project, ref: resource.target_branch, sha: resource.merge_commit_sha) } - - before do - project.add_maintainer(user) - end - - context 'when user cannot read pipelines on target project' do - before do - project.team.truncate - end - - it 'returns nil' do - expect(subject[:merge_pipeline]).to be_nil - end - end - - it 'returns merge_pipeline' do - pipeline_payload = - MergeRequests::PipelineEntity - .represent(pipeline, request: request) - .as_json - - expect(subject[:merge_pipeline]).to eq(pipeline_payload) - end - - context 'when merge_request_cached_merge_pipeline_serializer is enabled' do - before do - stub_feature_flags(merge_request_cached_merge_pipeline_serializer: true) - end - - it 'returns nil' do - expect(subject[:merge_pipeline]).to be_nil - end - end - end - end - describe 'new_blob_path' do context 'when user can push to project' do it 'returns path' do diff --git a/spec/services/merge_requests/add_spent_time_service_spec.rb b/spec/services/merge_requests/add_spent_time_service_spec.rb index db3380e9582..1e0b3e07f26 100644 --- a/spec/services/merge_requests/add_spent_time_service_spec.rb +++ b/spec/services/merge_requests/add_spent_time_service_spec.rb @@ -8,7 +8,7 @@ RSpec.describe MergeRequests::AddSpentTimeService do let_it_be_with_reload(:merge_request) { create(:merge_request, :simple, :unique_branches, source_project: project) } let(:duration) { 1500 } - let(:params) { { spend_time: { duration: duration, user_id: user.id } } } + let(:params) { { spend_time: { duration: duration, summary: 'summary', user_id: user.id } } } let(:service) { described_class.new(project: project, current_user: user, params: params) } describe '#execute' do @@ -16,13 +16,14 @@ RSpec.describe MergeRequests::AddSpentTimeService do project.add_developer(user) end - it 'creates a new timelog with the specified duration' do + it 'creates a new timelog with the specified duration and summary' do expect { service.execute(merge_request) }.to change { Timelog.count }.from(0).to(1) timelog = merge_request.timelogs.last expect(timelog).not_to be_nil expect(timelog.time_spent).to eq(1500) + expect(timelog.summary).to eq('summary') end it 'creates a system note with the time added' do diff --git a/spec/support/shared_examples/requests/api/time_tracking_shared_examples.rb b/spec/support/shared_examples/requests/api/time_tracking_shared_examples.rb index afc902dd184..104e91add8b 100644 --- a/spec/support/shared_examples/requests/api/time_tracking_shared_examples.rb +++ b/spec/support/shared_examples/requests/api/time_tracking_shared_examples.rb @@ -128,17 +128,25 @@ RSpec.shared_examples 'time tracking endpoints' do |issuable_name| if issuable_name == 'merge_request' it 'calls update service with :use_specialized_service param' do - expect(::MergeRequests::UpdateService).to receive(:new).with(project: project, current_user: user, params: hash_including(use_specialized_service: true)) - - post api("/projects/#{project.id}/#{issuable_collection_name}/#{issuable.iid}/add_spent_time", user), params: { duration: '2h' } + expect(::MergeRequests::UpdateService).to receive(:new).with( + project: project, + current_user: user, + params: hash_including( + use_specialized_service: true, + spend_time: hash_including(duration: 7200, summary: 'summary'))) + + post api("/projects/#{project.id}/#{issuable_collection_name}/#{issuable.iid}/add_spent_time", user), params: { duration: '2h', summary: 'summary' } end end if issuable_name == 'issue' it 'calls update service without :use_specialized_service param' do - expect(::Issues::UpdateService).to receive(:new).with(project: project, current_user: user, params: hash_not_including(use_specialized_service: true)) + expect(::Issues::UpdateService).to receive(:new).with( + project: project, + current_user: user, + params: { spend_time: { duration: 3600, summary: 'summary', user_id: user.id } }) - post api("/projects/#{project.id}/#{issuable_collection_name}/#{issuable.iid}/add_spent_time", user), params: { duration: '2h' } + post api("/projects/#{project.id}/#{issuable_collection_name}/#{issuable.iid}/add_spent_time", user), params: { duration: '1h', summary: 'summary' } end end end |