Merge branch 'blackst0ne-rails5-update-bin-rspec' into 'master'

[Rails5] Allow using `RAILS5` env with rspec See merge request gitlab-org/gitlab-ce!18140

Merge branch 'blackst0ne-rails5-update-bin-rspec' into 'master'
4131c39a · Rémy Coutable · e3e461fb · 126b7c0f · 4131c39a
Commit 4131c39a authored Apr 03, 2018 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

rspec bin/rspec +6 -0

No files found.
--- a/bin/rspec
+++ b/bin/rspec
 #!/usr/bin/env ruby
+
+# Remove these two lines below when upgraded to rails 5.0.
+# Allow run `rspec` command as `RAILS5=1 rspec ...` instead of `BUNDLE_GEMFILE=Gemfile.rails5 rspec ...`
+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