diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 01:45:44 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-19 01:45:44 +0000 |
commit | 85dc423f7090da0a52c73eb66faf22ddb20efff9 (patch) | |
tree | 9160f299afd8c80c038f08e1545be119f5e3f1e1 /spec/lib/gitlab/github_import | |
parent | 15c2c8c66dbe422588e5411eee7e68f1fa440bb8 (diff) | |
download | gitlab-ce-85dc423f7090da0a52c73eb66faf22ddb20efff9.tar.gz |
Add latest changes from gitlab-org/gitlab@13-4-stable-ee
Diffstat (limited to 'spec/lib/gitlab/github_import')
6 files changed, 11 insertions, 11 deletions
diff --git a/spec/lib/gitlab/github_import/importer/label_links_importer_spec.rb b/spec/lib/gitlab/github_import/importer/label_links_importer_spec.rb index 4d3245fc988..6d143f78c66 100644 --- a/spec/lib/gitlab/github_import/importer/label_links_importer_spec.rb +++ b/spec/lib/gitlab/github_import/importer/label_links_importer_spec.rb @@ -38,7 +38,7 @@ RSpec.describe Gitlab::GithubImport::Importer::LabelLinksImporter do .to receive(:find_target_id) .and_return(1) - Timecop.freeze do + freeze_time do expect(Gitlab::Database) .to receive(:bulk_insert) .with( diff --git a/spec/lib/gitlab/github_import/importer/labels_importer_spec.rb b/spec/lib/gitlab/github_import/importer/labels_importer_spec.rb index 0010b959a49..ca9d3e1e21c 100644 --- a/spec/lib/gitlab/github_import/importer/labels_importer_spec.rb +++ b/spec/lib/gitlab/github_import/importer/labels_importer_spec.rb @@ -85,13 +85,13 @@ RSpec.describe Gitlab::GithubImport::Importer::LabelsImporter, :clean_gitlab_red end it 'includes the created timestamp' do - Timecop.freeze do + freeze_time do expect(label_hash[:created_at]).to eq(Time.zone.now) end end it 'includes the updated timestamp' do - Timecop.freeze do + freeze_time do expect(label_hash[:updated_at]).to eq(Time.zone.now) end end diff --git a/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb b/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb index 05ac0248ec9..0835c6155b9 100644 --- a/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb +++ b/spec/lib/gitlab/github_import/importer/pull_requests_importer_spec.rb @@ -164,7 +164,7 @@ RSpec.describe Gitlab::GithubImport::Importer::PullRequestsImporter do .to receive(:increment) .and_call_original - Timecop.freeze do + freeze_time do importer.update_repository expect(project.last_repository_updated_at).to be_like_time(Time.zone.now) diff --git a/spec/lib/gitlab/github_import/importer/repository_importer_spec.rb b/spec/lib/gitlab/github_import/importer/repository_importer_spec.rb index 65dba2711b9..180c6d9e420 100644 --- a/spec/lib/gitlab/github_import/importer/repository_importer_spec.rb +++ b/spec/lib/gitlab/github_import/importer/repository_importer_spec.rb @@ -261,7 +261,7 @@ RSpec.describe Gitlab::GithubImport::Importer::RepositoryImporter do describe '#update_clone_time' do it 'sets the timestamp for when the cloning process finished' do - Timecop.freeze do + freeze_time do expect(project) .to receive(:update_column) .with(:last_repository_updated_at, Time.zone.now) diff --git a/spec/lib/gitlab/github_import/label_finder_spec.rb b/spec/lib/gitlab/github_import/label_finder_spec.rb index 452f3c896a4..9905fce2a20 100644 --- a/spec/lib/gitlab/github_import/label_finder_spec.rb +++ b/spec/lib/gitlab/github_import/label_finder_spec.rb @@ -3,10 +3,10 @@ require 'spec_helper' RSpec.describe Gitlab::GithubImport::LabelFinder, :clean_gitlab_redis_cache do - let(:project) { create(:project) } - let(:finder) { described_class.new(project) } - let!(:bug) { create(:label, project: project, name: 'Bug') } - let!(:feature) { create(:label, project: project, name: 'Feature') } + let_it_be(:project) { create(:project) } + let_it_be(:finder) { described_class.new(project) } + let_it_be(:bug) { create(:label, project: project, name: 'Bug') } + let_it_be(:feature) { create(:label, project: project, name: 'Feature') } describe '#id_for' do context 'with a cache in place' do diff --git a/spec/lib/gitlab/github_import/milestone_finder_spec.rb b/spec/lib/gitlab/github_import/milestone_finder_spec.rb index 419184d6115..5da45b1897f 100644 --- a/spec/lib/gitlab/github_import/milestone_finder_spec.rb +++ b/spec/lib/gitlab/github_import/milestone_finder_spec.rb @@ -3,8 +3,8 @@ require 'spec_helper' RSpec.describe Gitlab::GithubImport::MilestoneFinder, :clean_gitlab_redis_cache do - let!(:project) { create(:project) } - let!(:milestone) { create(:milestone, project: project) } + let_it_be(:project) { create(:project) } + let_it_be(:milestone) { create(:milestone, project: project) } let(:finder) { described_class.new(project) } describe '#id_for' do |