Skip to content
This repository has been archived by the owner on Dec 13, 2023. It is now read-only.

Fix broken test on Travis CI #79

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ appraise 'rails-41' do
gem 'rails', '~> 4.1.1'
end

appraise 'rails-42' do
gem 'rails', '~> 4.2.0'
end

appraise 'rails-5' do
gem 'rails', '~> 5.0'
gem 'rails', '~> 5.0.0'
gem 'rails-controller-testing'
end
2 changes: 1 addition & 1 deletion gemfiles/rails_3.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ source "https://rubygems.org"
gem "rails", "~> 3.2.18"
gem "test-unit", "~> 3.0"

gemspec :path => "../"
gemspec path: "../"
2 changes: 1 addition & 1 deletion gemfiles/rails_4.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ source "https://rubygems.org"

gem "rails", "~> 4.0.5"

gemspec :path => "../"
gemspec path: "../"
2 changes: 1 addition & 1 deletion gemfiles/rails_41.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ source "https://rubygems.org"

gem "rails", "~> 4.1.1"

gemspec :path => "../"
gemspec path: "../"
7 changes: 7 additions & 0 deletions gemfiles/rails_42.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rails", "~> 4.2.0"

gemspec path: "../"
4 changes: 2 additions & 2 deletions gemfiles/rails_5.gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

source "https://rubygems.org"

gem "rails", "~> 5.0"
gem "rails", "~> 5.0.0"
gem "rails-controller-testing"

gemspec :path => "../"
gemspec path: "../"
2 changes: 1 addition & 1 deletion test/dummy/config/boot.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Set up gems listed in the Gemfile.
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)

require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)