Permalink
Browse files

Merge pull request #26475 from maclover7/jm-fix-tests

Update github --> git Gemfile references
  • Loading branch information...
guilleiguaran committed Sep 12, 2016
2 parents fbad55a + 51ba714 commit a107bd193cef27bb60f05d1361c71891452ea71d
Showing with 29 additions and 11 deletions.
  1. +7 −7 Gemfile
  2. +4 −4 Gemfile.lock
  3. +18 −0 railties/test/application/bin_setup_test.rb
View
14 Gemfile
@@ -25,10 +25,10 @@ gem 'bcrypt', '~> 3.1.11', require: false
gem 'uglifier', '>= 1.3.0', require: false
# Track stable branch of sass because it doesn't have circular require warnings.
gem 'sass', github: 'sass/sass', branch: 'stable', require: false
gem 'sass', git: 'https://github.com/sass/sass', branch: 'stable', require: false
# FIXME: Remove this fork after https://github.com/nex3/rb-inotify/pull/49 is fixed.
gem 'rb-inotify', github: 'matthewd/rb-inotify', branch: 'close-handling', require: false
gem 'rb-inotify', git: 'https://github.com/matthewd/rb-inotify', branch: 'close-handling', require: false
group :doc do
gem 'sdoc', '~> 0.4.0'
@@ -48,7 +48,7 @@ group :job do
gem 'sidekiq', require: false
gem 'sucker_punch', require: false
gem 'delayed_job', require: false
gem 'queue_classic', github: "QueueClassic/queue_classic", branch: 'master', require: false, platforms: :ruby
gem 'queue_classic', git: "https://github.com/QueueClassic/queue_classic", branch: 'master', require: false, platforms: :ruby
gem 'sneakers', require: false
gem 'que', require: false
gem 'backburner', require: false
@@ -104,10 +104,10 @@ end
platforms :jruby do
if ENV['AR_JDBC']
gem 'activerecord-jdbcsqlite3-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master'
gem 'activerecord-jdbcsqlite3-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', branch: 'master'
group :db do
gem 'activerecord-jdbcmysql-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master'
gem 'activerecord-jdbcpostgresql-adapter', github: 'jruby/activerecord-jdbc-adapter', branch: 'master'
gem 'activerecord-jdbcmysql-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', branch: 'master'
gem 'activerecord-jdbcpostgresql-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', branch: 'master'
end
else
gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0'
@@ -129,7 +129,7 @@ if ENV['ORACLE_ENHANCED']
platforms :ruby do
gem 'ruby-oci8', '~> 2.2'
end
gem 'activerecord-oracle_enhanced-adapter', github: 'rsim/oracle-enhanced', branch: 'master'
gem 'activerecord-oracle_enhanced-adapter', git: 'https://github.com/rsim/oracle-enhanced', branch: 'master'
end
# A gem necessary for Active Record tests with IBM DB.
View
@@ -1,21 +1,21 @@
GIT
remote: git://github.com/QueueClassic/queue_classic.git
revision: 3c53a465786a1d3c40730c31b693d74c7bfa16cb
remote: https://github.com/QueueClassic/queue_classic
revision: 1ef197b9db8149a895e59077badcb5b94d4c8b44
branch: master
specs:
queue_classic (3.2.0.RC1)
pg (>= 0.17, < 0.19)
GIT
remote: git://github.com/matthewd/rb-inotify.git
remote: https://github.com/matthewd/rb-inotify
revision: 90553518d1fb79aedc98a3036c59bd2b6731ac40
branch: close-handling
specs:
rb-inotify (0.9.7)
ffi (>= 0.5.0)
GIT
remote: git://github.com/sass/sass.git
remote: https://github.com/sass/sass
revision: 7716e67f3507c6f65878c69aa49ec358ebf675c7
branch: stable
specs:
@@ -6,10 +6,17 @@ class BinSetupTest < ActiveSupport::TestCase
def setup
build_app
create_gemfile
update_boot_file_to_use_bundler
@old_gemfile_env = ENV["BUNDLE_GEMFILE"]
ENV["BUNDLE_GEMFILE"] = app_path + "/Gemfile"
end
def teardown
teardown_app
ENV["BUNDLE_GEMFILE"] = @old_gemfile_env
end
def test_bin_setup
@@ -52,5 +59,16 @@ def test_bin_setup_output
OUTPUT
end
end
private
def create_gemfile
app_file("Gemfile", "source 'https://rubygems.org'")
app_file("Gemfile", "gem 'rails', path: '#{RAILS_FRAMEWORK_ROOT}'", "a")
app_file("Gemfile", "gem 'sqlite3'", "a")
end
def update_boot_file_to_use_bundler
app_file("config/boot.rb", "require 'bundler/setup'")
end
end
end

0 comments on commit a107bd1

Please sign in to comment.