Merge branch 'fix_backup_spec' into 'master'

Fix Backup Spec

Merge branch 'fix_backup_spec' into 'master'
Fix Backup Spec
Dmitriy Zaporozhets
2 parents 8a06144c 46b1c63b
Showing 1 changed file with 2 additions and 2 deletions Show diff stats
spec/tasks/gitlab/backup_rake_spec.rb
@@ -32,10 +32,10 @@ describe &#39;gitlab:app namespace rake task&#39; 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
...	...	@@ -32,10 +32,10 @@ describe 'gitlab:app namespace rake task' do
32	32	Rake::Task["gitlab:shell:setup"].stub invoke: true
33	33	end
34	34
35		- let(:gitlab_version) { %x{git rev-parse HEAD}.gsub(/\n/,"") }
	35	+ let(:gitlab_version) { Gitlab::VERSION }
36	36
37	37	it 'should fail on mismatch' do
38		- YAML.stub load_file: {gitlab_version: gitlab_version.reverse}
	38	+ YAML.stub load_file: {gitlab_version: "not #{gitlab_version}" }
39	39	expect { run_rake_task }.to raise_error SystemExit
40	40	end
41	41
...	...