Commit f9780eeeca8872c5438f114d12add81785abf41c
1 parent
38d8d749
Exists in
spb-stable
and in
3 other branches
Fix deprecation in specs
From https://github.com/gitlabhq/gitlabhq/pull/6053
Showing
1 changed file
with
6 additions
and
1 deletions
Show diff stats
spec/tasks/gitlab/backup_rake_spec.rb
| @@ -5,6 +5,7 @@ describe 'gitlab:app namespace rake task' do | @@ -5,6 +5,7 @@ describe 'gitlab:app namespace rake task' do | ||
| 5 | before :all do | 5 | before :all do |
| 6 | Rake.application.rake_require "tasks/gitlab/task_helpers" | 6 | Rake.application.rake_require "tasks/gitlab/task_helpers" |
| 7 | Rake.application.rake_require "tasks/gitlab/backup" | 7 | Rake.application.rake_require "tasks/gitlab/backup" |
| 8 | + Rake.application.rake_require "tasks/gitlab/shell" | ||
| 8 | # empty task as env is already loaded | 9 | # empty task as env is already loaded |
| 9 | Rake::Task.define_task :environment | 10 | Rake::Task.define_task :environment |
| 10 | end | 11 | end |
| @@ -26,6 +27,9 @@ describe 'gitlab:app namespace rake task' do | @@ -26,6 +27,9 @@ describe 'gitlab:app namespace rake task' do | ||
| 26 | Dir.stub :chdir | 27 | Dir.stub :chdir |
| 27 | File.stub exists?: true | 28 | File.stub exists?: true |
| 28 | Kernel.stub system: true | 29 | Kernel.stub system: true |
| 30 | + FileUtils.stub cp_r: true | ||
| 31 | + FileUtils.stub mv: true | ||
| 32 | + Rake::Task["gitlab:shell:setup"].stub invoke: true | ||
| 29 | end | 33 | end |
| 30 | 34 | ||
| 31 | let(:gitlab_version) { %x{git rev-parse HEAD}.gsub(/\n/,"") } | 35 | let(:gitlab_version) { %x{git rev-parse HEAD}.gsub(/\n/,"") } |
| @@ -39,7 +43,8 @@ describe 'gitlab:app namespace rake task' do | @@ -39,7 +43,8 @@ describe 'gitlab:app namespace rake task' do | ||
| 39 | YAML.stub load_file: {gitlab_version: gitlab_version} | 43 | YAML.stub load_file: {gitlab_version: gitlab_version} |
| 40 | Rake::Task["gitlab:backup:db:restore"].should_receive :invoke | 44 | Rake::Task["gitlab:backup:db:restore"].should_receive :invoke |
| 41 | Rake::Task["gitlab:backup:repo:restore"].should_receive :invoke | 45 | Rake::Task["gitlab:backup:repo:restore"].should_receive :invoke |
| 42 | - expect { run_rake_task }.to_not raise_error SystemExit | 46 | + Rake::Task["gitlab:shell:setup"].should_receive :invoke |
| 47 | + expect { run_rake_task }.to_not raise_error | ||
| 43 | end | 48 | end |
| 44 | end | 49 | end |
| 45 | 50 |