summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-28 14:21:33 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-02-28 14:21:33 +0000
commitba9ff219730fb4d41daf702ff7d4246ff62a6025 (patch)
treee113b0ff28614d1df98bf4dfc5d35e93c4cd371e
parent8a06144c94b3ddea62874b9973cf8744d857bf1a (diff)
parent46b1c63b7af29ecc24292b20b7f246ff5f189048 (diff)
downloadgitlab-ce-ba9ff219730fb4d41daf702ff7d4246ff62a6025.tar.gz
Merge branch 'fix_backup_spec' into 'master'
Fix Backup Spec
-rw-r--r--spec/tasks/gitlab/backup_rake_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/tasks/gitlab/backup_rake_spec.rb b/spec/tasks/gitlab/backup_rake_spec.rb
index a5541bee876..71a45eb2fa6 100644
--- a/spec/tasks/gitlab/backup_rake_spec.rb
+++ b/spec/tasks/gitlab/backup_rake_spec.rb
@@ -32,10 +32,10 @@ describe 'gitlab:app namespace rake task' do
Rake::Task["gitlab:shell:setup"].stub invoke: true
end
- let(:gitlab_version) { %x{git rev-parse HEAD}.gsub(/\n/,"") }
+ let(:gitlab_version) { Gitlab::VERSION }
it 'should fail on mismatch' do
- YAML.stub load_file: {gitlab_version: gitlab_version.reverse}
+ YAML.stub load_file: {gitlab_version: "not #{gitlab_version}" }
expect { run_rake_task }.to raise_error SystemExit
end