Merge branch 'rs-test-env-fixes' into 'master'

Don't delete gitlab-test-fork folder after every test run

72a7febead added a forked repository cloned to `tmp/tests/gitlab-test-fork` but because it wasn't added to the list of folders not to delete every run, it was being cloned every run and adding extraneous console output.

See merge request !600

spec/support/test_env.rb

@@ -35,6 +35,7 @@ module TestEnv
 
     # Create repository for FactoryGirl.create(:project)
     setup_factory_repo
+
     # Create repository for FactoryGirl.create(:forked_project_with_submodules)
     setup_forked_repo
   end
@@ -54,7 +55,7 @@ module TestEnv
     tmp_test_path = Rails.root.join('tmp', 'tests', '**')
 
     Dir[tmp_test_path].each do |entry|
-      unless File.basename(entry) =~ /\Agitlab-(shell|test)\z/
+      unless File.basename(entry) =~ /\Agitlab-(shell|test|test-fork)\z/
         FileUtils.rm_rf(entry)
       end
     end