summaryrefslogtreecommitdiff
path: root/spec/tasks
diff options
context:
space:
mode:
authorAndrew Kumanyaev <me@zzet.org>2014-01-15 14:00:11 +0300
committerAndrew Kumanyaev <me@zzet.org>2014-01-15 14:00:11 +0300
commitf9780eeeca8872c5438f114d12add81785abf41c (patch)
tree24a003d1e20bcdda1cea6a128a4c773718894efd /spec/tasks
parent38d8d749d73921f370ec8ff28e19f2a5fb7e6f34 (diff)
downloadgitlab-ce-f9780eeeca8872c5438f114d12add81785abf41c.tar.gz
Fix deprecation in specs
From https://github.com/gitlabhq/gitlabhq/pull/6053
Diffstat (limited to 'spec/tasks')
-rw-r--r--spec/tasks/gitlab/backup_rake_spec.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/spec/tasks/gitlab/backup_rake_spec.rb b/spec/tasks/gitlab/backup_rake_spec.rb
index cba243226db..a5541bee876 100644
--- a/spec/tasks/gitlab/backup_rake_spec.rb
+++ b/spec/tasks/gitlab/backup_rake_spec.rb
@@ -5,6 +5,7 @@ describe 'gitlab:app namespace rake task' do
before :all do
Rake.application.rake_require "tasks/gitlab/task_helpers"
Rake.application.rake_require "tasks/gitlab/backup"
+ Rake.application.rake_require "tasks/gitlab/shell"
# empty task as env is already loaded
Rake::Task.define_task :environment
end
@@ -26,6 +27,9 @@ describe 'gitlab:app namespace rake task' do
Dir.stub :chdir
File.stub exists?: true
Kernel.stub system: true
+ FileUtils.stub cp_r: true
+ FileUtils.stub mv: true
+ Rake::Task["gitlab:shell:setup"].stub invoke: true
end
let(:gitlab_version) { %x{git rev-parse HEAD}.gsub(/\n/,"") }
@@ -39,7 +43,8 @@ describe 'gitlab:app namespace rake task' do
YAML.stub load_file: {gitlab_version: gitlab_version}
Rake::Task["gitlab:backup:db: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