diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-16 18:18:40 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-16 18:18:40 +0300 |
commit | ab1e86ea87439843ba5d278eced1dddff7d3f5a5 (patch) | |
tree | 15751b4199761a350ba75723deb37f58f57b3851 /spec | |
parent | 9bf0c33b634f078e3b6419ec6d59297ebde34cc1 (diff) |
Add latest changes from gitlab-org/gitlab@12-5-stable-ee
Diffstat (limited to 'spec')
4 files changed, 46 insertions, 17 deletions
diff --git a/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb b/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb index e2bcdfd1e2b..859638f1a52 100644 --- a/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb +++ b/spec/features/merge_request/user_suggests_changes_on_diff_spec.rb @@ -139,6 +139,10 @@ describe 'User comments on a diff', :js do # Making sure it's not a Front-end cache. visit(diffs_project_merge_request_path(project, merge_request)) + page.within '.line-resolve-all-container' do + page.find('.discussion-next-btn').click + end + expect_appliable_suggestions(2) page.within("[id='#{hash}']") do diff --git a/spec/lib/gitlab/gitaly_client/cleanup_service_spec.rb b/spec/lib/gitlab/gitaly_client/cleanup_service_spec.rb index c6c7fa1c38a..3430fbb71f1 100644 --- a/spec/lib/gitlab/gitaly_client/cleanup_service_spec.rb +++ b/spec/lib/gitlab/gitaly_client/cleanup_service_spec.rb @@ -9,6 +9,10 @@ describe Gitlab::GitalyClient::CleanupService do let(:client) { described_class.new(project.repository) } describe '#apply_bfg_object_map_stream' do + before do + ::Gitlab::GitalyClient.clear_stubs! + end + it 'sends an apply_bfg_object_map_stream message' do expect_any_instance_of(Gitaly::CleanupService::Stub) .to receive(:apply_bfg_object_map_stream) diff --git a/spec/models/ci/build_runner_session_spec.rb b/spec/models/ci/build_runner_session_spec.rb index e51fd009f50..cdf56f24cd7 100644 --- a/spec/models/ci/build_runner_session_spec.rb +++ b/spec/models/ci/build_runner_session_spec.rb @@ -4,6 +4,7 @@ require 'spec_helper' describe Ci::BuildRunnerSession, model: true do let!(:build) { create(:ci_build, :with_runner_session) } + let(:url) { 'https://new.example.com' } subject { build.runner_session } @@ -12,6 +13,25 @@ describe Ci::BuildRunnerSession, model: true do it { is_expected.to validate_presence_of(:build) } it { is_expected.to validate_presence_of(:url).with_message('must be a valid URL') } + context 'nested attribute assignment' do + it 'creates a new session' do + simple_build = create(:ci_build) + simple_build.runner_session_attributes = { url: url } + simple_build.save! + + session = simple_build.reload.runner_session + expect(session).to be_a(Ci::BuildRunnerSession) + expect(session.url).to eq(url) + end + + it 'updates session with new attributes' do + build.runner_session_attributes = { url: url } + build.save! + + expect(build.reload.runner_session.url).to eq(url) + end + end + describe '#terminal_specification' do let(:specification) { subject.terminal_specification } diff --git a/spec/models/project_services/asana_service_spec.rb b/spec/models/project_services/asana_service_spec.rb index 18e839bcc64..8b6f2888c0a 100644 --- a/spec/models/project_services/asana_service_spec.rb +++ b/spec/models/project_services/asana_service_spec.rb @@ -21,6 +21,7 @@ describe AsanaService do describe 'Execute' do let(:user) { create(:user) } let(:project) { create(:project) } + let(:gid) { "123456789ABCD" } def create_data_for_commits(*messages) { @@ -48,32 +49,32 @@ describe AsanaService do end it 'calls Asana service to create a story' do - data = create_data_for_commits('Message from commit. related to #123456') + data = create_data_for_commits("Message from commit. related to ##{gid}") expected_message = "#{data[:user_name]} pushed to branch #{data[:ref]} of #{project.full_name} ( #{data[:commits][0][:url]} ): #{data[:commits][0][:message]}" - d1 = double('Asana::Task') + d1 = double('Asana::Resources::Task') expect(d1).to receive(:add_comment).with(text: expected_message) - expect(Asana::Task).to receive(:find_by_id).with(anything, '123456').once.and_return(d1) + expect(Asana::Resources::Task).to receive(:find_by_id).with(anything, gid).once.and_return(d1) @asana.execute(data) end it 'calls Asana service to create a story and close a task' do data = create_data_for_commits('fix #456789') - d1 = double('Asana::Task') + d1 = double('Asana::Resources::Task') expect(d1).to receive(:add_comment) expect(d1).to receive(:update).with(completed: true) - expect(Asana::Task).to receive(:find_by_id).with(anything, '456789').once.and_return(d1) + expect(Asana::Resources::Task).to receive(:find_by_id).with(anything, '456789').once.and_return(d1) @asana.execute(data) end it 'is able to close via url' do data = create_data_for_commits('closes https://app.asana.com/19292/956299/42') - d1 = double('Asana::Task') + d1 = double('Asana::Resources::Task') expect(d1).to receive(:add_comment) expect(d1).to receive(:update).with(completed: true) - expect(Asana::Task).to receive(:find_by_id).with(anything, '42').once.and_return(d1) + expect(Asana::Resources::Task).to receive(:find_by_id).with(anything, '42').once.and_return(d1) @asana.execute(data) end @@ -84,28 +85,28 @@ describe AsanaService do ref https://app.asana.com/19292/956299/42 and closing https://app.asana.com/19292/956299/12 EOF data = create_data_for_commits(message) - d1 = double('Asana::Task') + d1 = double('Asana::Resources::Task') expect(d1).to receive(:add_comment) expect(d1).to receive(:update).with(completed: true) - expect(Asana::Task).to receive(:find_by_id).with(anything, '123').once.and_return(d1) + expect(Asana::Resources::Task).to receive(:find_by_id).with(anything, '123').once.and_return(d1) - d2 = double('Asana::Task') + d2 = double('Asana::Resources::Task') expect(d2).to receive(:add_comment) expect(d2).to receive(:update).with(completed: true) - expect(Asana::Task).to receive(:find_by_id).with(anything, '456').once.and_return(d2) + expect(Asana::Resources::Task).to receive(:find_by_id).with(anything, '456').once.and_return(d2) - d3 = double('Asana::Task') + d3 = double('Asana::Resources::Task') expect(d3).to receive(:add_comment) - expect(Asana::Task).to receive(:find_by_id).with(anything, '789').once.and_return(d3) + expect(Asana::Resources::Task).to receive(:find_by_id).with(anything, '789').once.and_return(d3) - d4 = double('Asana::Task') + d4 = double('Asana::Resources::Task') expect(d4).to receive(:add_comment) - expect(Asana::Task).to receive(:find_by_id).with(anything, '42').once.and_return(d4) + expect(Asana::Resources::Task).to receive(:find_by_id).with(anything, '42').once.and_return(d4) - d5 = double('Asana::Task') + d5 = double('Asana::Resources::Task') expect(d5).to receive(:add_comment) expect(d5).to receive(:update).with(completed: true) - expect(Asana::Task).to receive(:find_by_id).with(anything, '12').once.and_return(d5) + expect(Asana::Resources::Task).to receive(:find_by_id).with(anything, '12').once.and_return(d5) @asana.execute(data) end |