Skip to content

Commit 78226b2

Browse files
committed
refactor(travis) add gemfiles
1 parent 645924b commit 78226b2

File tree

6 files changed

+18
-7
lines changed

6 files changed

+18
-7
lines changed

.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
language: ruby
22
sudo: false
3+
cache: bundler
34
rvm:
45
- 2.3.0
56
- 2.2.4
@@ -12,7 +13,8 @@ gemfile:
1213
- gemfiles/rails_3.2.gemfile
1314
- gemfiles/rails_4.0.gemfile
1415
- gemfiles/rails_4.0_with_therubyracer.gemfile
15-
- gemfiles/rails_4.2.gemfile
16+
- gemfiles/rails_4.2_sprockets_2.gemfile
17+
- gemfiles/rails_4.2_sprockets_3.gemfile
1618
- gemfiles/rails_4.1.gemfile
1719
- gemfiles/rails_5.gemfile
1820

@@ -33,3 +35,4 @@ before_install:
3335
- wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2
3436
- tar -xvf $PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64.tar.bz2 -C $PWD/travis-phantomjs
3537
- export PATH=$PWD/travis-phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
38+
- phantomjs --version

Appraisals

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,22 @@ end
1313

1414
appraise "rails-4.1" do
1515
gem 'rails', '~> 4.1.10'
16+
# Just to make sure we support old Turbolinks:
17+
gem "turbolinks", "~> 2.3.0"
1618
end
1719

18-
appraise "rails-4.2" do
20+
appraise "rails-4.2-sprockets_2" do
1921
gem 'rails', '~> 4.2.1'
22+
gem "sprockets", "~> 2.12"
2023
end
2124

25+
appraise "rails-4.2-sprockets_3" do
26+
gem 'rails', '~> 4.2.1'
27+
gem "sprockets", "~> 3.5"
28+
gem "turbolinks", "~> 2.5.0"
29+
end
2230

2331
appraise "rails-5" do
24-
gem 'rails', '~> 5.0.0.beta1'
32+
gem 'rails', '~> 5.0.0.beta2'
33+
gem "turbolinks", "~> 5.0.0.beta"
2534
end

gemfiles/rails_4.1.gemfile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
source "http://rubygems.org"
44

55
gem "rails", "~> 4.1.10"
6-
7-
# Just to make sure we support old Turbolinks:
86
gem "turbolinks", "~> 2.3.0"
97

108
gemspec :path => "../"

gemfiles/rails_4.2-sprockets_2.gemfile renamed to gemfiles/rails_4.2_sprockets_2.gemfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ source "http://rubygems.org"
44

55
gem "rails", "~> 4.2.1"
66
gem "sprockets", "~> 2.12"
7+
78
gemspec :path => "../"

gemfiles/rails_4.2-sprockets_3.gemfile renamed to gemfiles/rails_4.2_sprockets_3.gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
source "http://rubygems.org"
44

55
gem "rails", "~> 4.2.1"
6-
gem "turbolinks", "~> 2.5.0"
76
gem "sprockets", "~> 3.5"
7+
gem "turbolinks", "~> 2.5.0"
88

99
gemspec :path => "../"

test/generators/install_generator_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
class InstallGeneratorTest < Rails::Generators::TestCase
55
destination File.join(Rails.root, 'tmp', 'generator_test_output')
66
tests React::Generators::InstallGenerator
7+
setup :prepare_destination
78

89
def copy_directory(dir)
910
source = Rails.root.join(dir)
@@ -15,7 +16,6 @@ def copy_directory(dir)
1516

1617
test "adds requires to `application.js`" do
1718
run_generator
18-
1919
assert_application_file_created
2020
end
2121

0 commit comments

Comments
 (0)