Commit f9780eee authored by Andrew Kumanyaev's avatar Andrew Kumanyaev

Fix deprecation in specs

From https://github.com/gitlabhq/gitlabhq/pull/6053
parent 38d8d749
...@@ -5,6 +5,7 @@ describe 'gitlab:app namespace rake task' do ...@@ -5,6 +5,7 @@ describe 'gitlab:app namespace rake task' do
before :all do before :all do
Rake.application.rake_require "tasks/gitlab/task_helpers" Rake.application.rake_require "tasks/gitlab/task_helpers"
Rake.application.rake_require "tasks/gitlab/backup" Rake.application.rake_require "tasks/gitlab/backup"
Rake.application.rake_require "tasks/gitlab/shell"
# empty task as env is already loaded # empty task as env is already loaded
Rake::Task.define_task :environment Rake::Task.define_task :environment
end end
...@@ -26,6 +27,9 @@ describe 'gitlab:app namespace rake task' do ...@@ -26,6 +27,9 @@ describe 'gitlab:app namespace rake task' do
Dir.stub :chdir Dir.stub :chdir
File.stub exists?: true File.stub exists?: true
Kernel.stub system: true Kernel.stub system: true
FileUtils.stub cp_r: true
FileUtils.stub mv: true
Rake::Task["gitlab:shell:setup"].stub invoke: true
end end
let(:gitlab_version) { %x{git rev-parse HEAD}.gsub(/\n/,"") } 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
YAML.stub load_file: {gitlab_version: gitlab_version} YAML.stub load_file: {gitlab_version: gitlab_version}
Rake::Task["gitlab:backup:db:restore"].should_receive :invoke Rake::Task["gitlab:backup:db:restore"].should_receive :invoke
Rake::Task["gitlab:backup:repo:restore"].should_receive :invoke Rake::Task["gitlab:backup:repo:restore"].should_receive :invoke
expect { run_rake_task }.to_not raise_error SystemExit Rake::Task["gitlab:shell:setup"].should_receive :invoke
expect { run_rake_task }.to_not raise_error
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment