1 files changed, 5 insertions, 12 deletions
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index bed78928f14..7995b5893e2 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -63,8 +63,6 @@ module TestEnv
   # See gitlab.yml.example test section for paths
   #
   def init(opts = {})
-    Rake.application.rake_require 'tasks/gitlab/helpers'
-    Rake::Task.define_task :environment
     # Disable mailer for spinach tests
     disable_mailer if opts[:mailer] == false
 
@@ -124,14 +122,11 @@ module TestEnv
   end
 
   def setup_gitlab_shell
-    gitlab_shell_dir = File.dirname(Gitlab.config.gitlab_shell.path)
-    gitlab_shell_needs_update = component_needs_update?(gitlab_shell_dir,
+    shell_needs_update = component_needs_update?(Gitlab.config.gitlab_shell.path,
       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"
+    unless !shell_needs_update || system('rake', 'gitlab:shell:install')
+      raise 'Can`t clone gitlab-shell'
     end
   end
 
@@ -147,10 +142,8 @@ 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"
+    unless !gitaly_needs_update || system('rake', "gitlab:gitaly:install[#{gitaly_dir}]")
+      raise "Can't clone gitaly"
     end
 
     start_gitaly(gitaly_dir)