diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 09:08:28 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 09:08:28 +0000 |
commit | 6ac4a6713ed3196af899011f7e18658e16ebaac0 (patch) | |
tree | c60237cb5203d171481b765d31bfead080d063cf /spec/migrations | |
parent | d2b64c37bdef067656fdc8deb4728a2fbc6c2729 (diff) | |
download | gitlab-ce-6ac4a6713ed3196af899011f7e18658e16ebaac0.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/migrations')
4 files changed, 10 insertions, 10 deletions
diff --git a/spec/migrations/generate_missing_routes_spec.rb b/spec/migrations/generate_missing_routes_spec.rb index 3ff220aa8d3..bc7cd3bd55e 100644 --- a/spec/migrations/generate_missing_routes_spec.rb +++ b/spec/migrations/generate_missing_routes_spec.rb @@ -26,7 +26,7 @@ describe GenerateMissingRoutes do described_class.new.up - route = routes.where(source_type: 'Project').take + route = routes.find_by(source_type: 'Project') expect(route.source_id).to eq(project.id) expect(route.path).to eq("gitlab/gitlab-ce-#{project.id}") @@ -37,7 +37,7 @@ describe GenerateMissingRoutes do described_class.new.up - route = routes.where(source_type: 'Namespace').take + route = routes.find_by(source_type: 'Namespace') expect(route.source_id).to eq(namespace.id) expect(route.path).to eq("gitlab-#{namespace.id}") diff --git a/spec/migrations/migrate_auto_dev_ops_domain_to_cluster_domain_spec.rb b/spec/migrations/migrate_auto_dev_ops_domain_to_cluster_domain_spec.rb index 9188c19f76a..2fe6f3f62a9 100644 --- a/spec/migrations/migrate_auto_dev_ops_domain_to_cluster_domain_spec.rb +++ b/spec/migrations/migrate_auto_dev_ops_domain_to_cluster_domain_spec.rb @@ -89,11 +89,11 @@ describe MigrateAutoDevOpsDomainToClusterDomain do end def find_cluster_project(project_id) - cluster_projects_table.where(project_id: project_id).first + cluster_projects_table.find_by(project_id: project_id) end def find_cluster(cluster_id) - clusters_table.where(id: cluster_id).first + clusters_table.find_by(id: cluster_id) end def project_auto_devops_with_domain diff --git a/spec/migrations/nullify_users_role_spec.rb b/spec/migrations/nullify_users_role_spec.rb index 487d84e2a35..b11929ef76f 100644 --- a/spec/migrations/nullify_users_role_spec.rb +++ b/spec/migrations/nullify_users_role_spec.rb @@ -18,16 +18,16 @@ describe NullifyUsersRole do it 'nullifies the role of the user with updated_at < 2019-11-05 12:08:00 and a role of 0' do expect(users.where(role: nil).count).to eq(1) - expect(users.where(role: nil).first.email).to eq('1') + expect(users.find_by(role: nil).email).to eq('1') end it 'leaves the user with role of 1' do expect(users.where(role: 1).count).to eq(1) - expect(users.where(role: 1).first.email).to eq('2') + expect(users.find_by(role: 1).email).to eq('2') end it 'leaves the user with updated_at > 2019-11-05 12:08:00' do expect(users.where(role: 0).count).to eq(1) - expect(users.where(role: 0).first.email).to eq('3') + expect(users.find_by(role: 0).email).to eq('3') end end diff --git a/spec/migrations/schedule_to_archive_legacy_traces_spec.rb b/spec/migrations/schedule_to_archive_legacy_traces_spec.rb index e9158df01c4..69c4b15a74f 100644 --- a/spec/migrations/schedule_to_archive_legacy_traces_spec.rb +++ b/spec/migrations/schedule_to_archive_legacy_traces_spec.rb @@ -39,9 +39,9 @@ describe ScheduleToArchiveLegacyTraces do expect(File.exist?(legacy_trace_path(@build_failed))).to be_falsy expect(File.exist?(legacy_trace_path(@builds_canceled))).to be_falsy expect(File.exist?(legacy_trace_path(@build_running))).to be_truthy - expect(File.exist?(archived_trace_path(job_artifacts.where(job_id: @build_success.id).first))).to be_truthy - expect(File.exist?(archived_trace_path(job_artifacts.where(job_id: @build_failed.id).first))).to be_truthy - expect(File.exist?(archived_trace_path(job_artifacts.where(job_id: @builds_canceled.id).first))).to be_truthy + expect(File.exist?(archived_trace_path(job_artifacts.find_by(job_id: @build_success.id)))).to be_truthy + expect(File.exist?(archived_trace_path(job_artifacts.find_by(job_id: @build_failed.id)))).to be_truthy + expect(File.exist?(archived_trace_path(job_artifacts.find_by(job_id: @builds_canceled.id)))).to be_truthy expect(job_artifacts.where(job_id: @build_running.id)).not_to be_exist end end |