Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'spec/models/deployment_spec.rb')
-rw-r--r--spec/models/deployment_spec.rb26
1 files changed, 22 insertions, 4 deletions
diff --git a/spec/models/deployment_spec.rb b/spec/models/deployment_spec.rb
index b91d836f82f..daa65f528e9 100644
--- a/spec/models/deployment_spec.rb
+++ b/spec/models/deployment_spec.rb
@@ -388,16 +388,31 @@ RSpec.describe Deployment do
end
context 'when deployment is behind current deployment' do
+ let_it_be(:commits) { project.repository.commits('master', limit: 2) }
+
let!(:deployment) do
- create(:deployment, :success, project: project, environment: environment, finished_at: 1.year.ago)
+ create(:deployment, :success, project: project, environment: environment,
+ finished_at: 1.year.ago, sha: commits[0].sha)
end
let!(:last_deployment) do
- create(:deployment, :success, project: project, environment: environment)
+ create(:deployment, :success, project: project, environment: environment, sha: commits[1].sha)
end
it { is_expected.to be_truthy }
end
+
+ context 'when deployment is the same sha as the current deployment' do
+ let!(:deployment) do
+ create(:deployment, :success, project: project, environment: environment, finished_at: 1.year.ago)
+ end
+
+ let!(:last_deployment) do
+ create(:deployment, :success, project: project, environment: environment, sha: deployment.sha)
+ end
+
+ it { is_expected.to be_falsey }
+ end
end
describe '#success?' do
@@ -1323,9 +1338,12 @@ RSpec.describe Deployment do
subject { deployment.tags }
it 'will return tags related to this deployment' do
- expect(project.repository).to receive(:tag_names_contains).with(deployment.sha, limit: 100).and_return(['test'])
+ expect(project.repository).to receive(:refs_by_oid).with(oid: deployment.sha,
+ limit: 100,
+ ref_patterns: [Gitlab::Git::TAG_REF_PREFIX])
+ .and_return(["#{Gitlab::Git::TAG_REF_PREFIX}test"])
- is_expected.to match_array(['test'])
+ is_expected.to match_array(['refs/tags/test'])
end
end