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/lib/gitlab/import_export | |
parent | d2b64c37bdef067656fdc8deb4728a2fbc6c2729 (diff) | |
download | gitlab-ce-6ac4a6713ed3196af899011f7e18658e16ebaac0.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/lib/gitlab/import_export')
-rw-r--r-- | spec/lib/gitlab/import_export/project/tree_restorer_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb b/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb index e38ef75d085..229f45e9543 100644 --- a/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb +++ b/spec/lib/gitlab/import_export/project/tree_restorer_spec.rb @@ -123,7 +123,7 @@ describe Gitlab::ImportExport::Project::TreeRestorer do end it 'preserves updated_at on issues' do - issue = Issue.where(description: 'Aliquam enim illo et possimus.').first + issue = Issue.find_by(description: 'Aliquam enim illo et possimus.') expect(issue.reload.updated_at.to_s).to eq('2016-06-14 15:02:47 UTC') end @@ -170,7 +170,7 @@ describe Gitlab::ImportExport::Project::TreeRestorer do end context 'event at forth level of the tree' do - let(:event) { Event.where(action: 6).first } + let(:event) { Event.find_by(action: 6) } it 'restores the event' do expect(event).not_to be_nil @@ -440,7 +440,7 @@ describe Gitlab::ImportExport::Project::TreeRestorer do end it 'restores external pull request for the restored pipeline' do - pipeline_with_external_pr = @project.ci_pipelines.where(source: 'external_pull_request_event').first + pipeline_with_external_pr = @project.ci_pipelines.find_by(source: 'external_pull_request_event') expect(pipeline_with_external_pr.external_pull_request).to be_persisted end |