diff options
author | Rémy Coutable <remy@rymai.me> | 2017-08-02 20:01:14 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-08-02 20:02:01 +0300 |
commit | 532ad2e56e10ff0e7922980d48a8c639efac8809 (patch) | |
tree | 676bbc34503d377f6d71060f596a2886563792e9 /spec/support/test_env.rb | |
parent | 6a29d3a4875fa25bfe3ea0a8afb747cb7708e6a1 (diff) |
Don't call load_tasks as this would load the tasks twice
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'spec/support/test_env.rb')
-rw-r--r-- | spec/support/test_env.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb index 8a509cf8a9c..f88924e84fd 100644 --- a/spec/support/test_env.rb +++ b/spec/support/test_env.rb @@ -63,8 +63,8 @@ module TestEnv # See gitlab.yml.example test section for paths # def init(opts = {}) - Gitlab::Application.load_tasks - + Rake.application.rake_require 'tasks/gitlab/helpers' + Rake::Task.define_task :environment # Disable mailer for spinach tests disable_mailer if opts[:mailer] == false @@ -128,6 +128,7 @@ module TestEnv gitlab_shell_needs_update = component_needs_update?(gitlab_shell_dir, Gitlab::Shell.version_required) + Rake.application.rake_require 'tasks/gitlab/shell' unless !gitlab_shell_needs_update || Rake.application.invoke_task('gitlab:shell:install') FileUtils.rm_rf(gitlab_shell_dir) raise "Can't install gitlab-shell" @@ -140,6 +141,7 @@ module TestEnv gitaly_needs_update = component_needs_update?(gitaly_dir, Gitlab::GitalyClient.expected_server_version) + Rake.application.rake_require 'tasks/gitlab/gitaly' unless !gitaly_needs_update || Rake.application.invoke_task("gitlab:gitaly:install[#{gitaly_dir}]") FileUtils.rm_rf(gitaly_dir) raise "Can't install gitaly" |