diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-04-10 15:49:58 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-04-10 15:49:58 +0000 |
| commit | 977e6849fe0b38f052c1a3297dcd7b52bac9158f (patch) | |
| tree | 1ccc233c2637c63347033bcd0a702f88e3bf4ab2 | |
| parent | 23fb465c75d00fd7156a540b7421a79e22df3966 (diff) | |
| parent | 1a455f3d5c2607c81af4f45a971f310d9210c2ba (diff) | |
| download | gitlab-ce-977e6849fe0b38f052c1a3297dcd7b52bac9158f.tar.gz | |
Merge branch 'blackst0ne-rails5-fix-spinach' into 'master'
[Rails5] Fix running spinach tests
See merge request gitlab-org/gitlab-ce!18281
| -rw-r--r-- | Gemfile.rails5.lock | 6 | ||||
| -rwxr-xr-x | bin/spinach | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/Gemfile.rails5.lock b/Gemfile.rails5.lock index 03fe5f2ed26..c953b9708a0 100644 --- a/Gemfile.rails5.lock +++ b/Gemfile.rails5.lock @@ -321,6 +321,9 @@ GEM rubyntlm (~> 0.5) globalid (0.4.1) activesupport (>= 4.2.0) + goldiloader (2.0.1) + activerecord (>= 4.2, < 5.2) + activesupport (>= 4.2, < 5.2) gollum-grit_adapter (1.0.1) gitlab-grit (~> 2.7, >= 2.7.1) gollum-lib (4.2.7) @@ -878,7 +881,7 @@ GEM simplecov-html (~> 0.10.0) simplecov-html (0.10.2) slack-notifier (1.5.1) - spinach (0.10.1) + spinach (0.8.10) colorize gherkin-ruby (>= 0.3.2) json @@ -1072,6 +1075,7 @@ DEPENDENCIES gitlab-markup (~> 1.6.2) gitlab-styles (~> 2.3) gitlab_omniauth-ldap (~> 2.0.4) + goldiloader (~> 2.0) gollum-lib (~> 4.2) gollum-rugged_adapter (~> 0.4.4) gon (~> 6.1.0) diff --git a/bin/spinach b/bin/spinach index 474050e29d1..eda81c9ed8a 100755 --- a/bin/spinach +++ b/bin/spinach @@ -1,4 +1,9 @@ #!/usr/bin/env ruby + +# Remove this block when removing rails5? code. +gemfile = %w[1 true].include?(ENV["RAILS5"]) ? "Gemfile.rails5" : "Gemfile" +ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../#{gemfile}", __dir__) + begin load File.expand_path('../spring', __FILE__) rescue LoadError => e |