diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /spec/models/repository_spec.rb | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'spec/models/repository_spec.rb')
-rw-r--r-- | spec/models/repository_spec.rb | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index be626dd6e32..c698b40a4c0 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -88,8 +88,8 @@ describe Repository do subject { repository.tags_sorted_by('updated_desc').map(&:name) } before do - double_first = double(committed_date: Time.now) - double_last = double(committed_date: Time.now - 1.second) + double_first = double(committed_date: Time.current) + double_last = double(committed_date: Time.current - 1.second) allow(tag_a).to receive(:dereferenced_target).and_return(double_first) allow(tag_b).to receive(:dereferenced_target).and_return(double_last) @@ -103,8 +103,8 @@ describe Repository do subject { repository.tags_sorted_by('updated_asc').map(&:name) } before do - double_first = double(committed_date: Time.now - 1.second) - double_last = double(committed_date: Time.now) + double_first = double(committed_date: Time.current - 1.second) + double_last = double(committed_date: Time.current) allow(tag_a).to receive(:dereferenced_target).and_return(double_last) allow(tag_b).to receive(:dereferenced_target).and_return(double_first) @@ -125,8 +125,8 @@ describe Repository do rugged_repo(repository).tags.create(annotated_tag_name, 'a48e4fc218069f68ef2e769dd8dfea3991362175', options) - double_first = double(committed_date: Time.now - 1.second) - double_last = double(committed_date: Time.now) + double_first = double(committed_date: Time.current - 1.second) + double_last = double(committed_date: Time.current) allow(tag_a).to receive(:dereferenced_target).and_return(double_last) allow(tag_b).to receive(:dereferenced_target).and_return(double_first) @@ -227,7 +227,7 @@ describe Repository do tree_builder = Rugged::Tree::Builder.new(rugged) tree_builder.insert({ oid: blob_id, name: "hello\x80world", filemode: 0100644 }) tree_id = tree_builder.write - user = { email: "jcai@gitlab.com", time: Time.now, name: "John Cai" } + user = { email: "jcai@gitlab.com", time: Time.current.to_time, name: "John Cai" } Rugged::Commit.create(rugged, message: 'some commit message', parents: [rugged.head.target.oid], tree: tree_id, committer: user, author: user) end @@ -974,7 +974,7 @@ describe Repository do end it 'returns nil' do - expect(Rails.logger).to receive(:info).with("Remove remote job failed to create for #{project.id} with remote name joe.") + expect(Gitlab::AppLogger).to receive(:info).with("Remove remote job failed to create for #{project.id} with remote name joe.") expect(repository.async_remove_remote('joe')).to be_nil end @@ -1446,17 +1446,13 @@ describe Repository do let(:empty_repository) { create(:project_empty_repo).repository } it 'returns empty array for an empty repository' do - # rubocop:disable Style/WordArray - expect(empty_repository.blobs_at(['master', 'foobar'])).to eq([]) - # rubocop:enable Style/WordArray + expect(empty_repository.blobs_at(%w[master foobar])).to eq([]) end it 'returns blob array for a non-empty repository' do repository.create_file(User.last, 'foobar', 'CONTENT', message: 'message', branch_name: 'master') - # rubocop:disable Style/WordArray - blobs = repository.blobs_at([['master', 'foobar']]) - # rubocop:enable Style/WordArray + blobs = repository.blobs_at([%w[master foobar]]) expect(blobs.first.name).to eq('foobar') expect(blobs.size).to eq(1) |