File tree Expand file tree Collapse file tree 2 files changed +10
-0
lines changed Expand file tree Collapse file tree 2 files changed +10
-0
lines changed Original file line number Diff line number Diff line change @@ -29,6 +29,10 @@ gem 'rack-cache', '< 1.3.0' if RUBY_VERSION < '2.0.0'
29
29
30
30
if RUBY_VERSION < '1.9.2'
31
31
gem 'nokogiri' , '~> 1.5.0'
32
+ elsif RUBY_VERSION < '1.9.3'
33
+ gem 'nokogiri' , '1.5.2'
34
+ else
35
+ gem 'nokogiri' , '1.6.7.1'
32
36
end
33
37
34
38
if RUBY_VERSION <= '1.8.7'
Original file line number Diff line number Diff line change
1
+ require 'nokogiri/version'
2
+
1
3
rspec_rails_repo_path = File . expand_path ( "../../" , __FILE__ )
2
4
rspec_dependencies_gemfile = File . join ( rspec_rails_repo_path , 'Gemfile-rspec-dependencies' )
3
5
rails_dependencies_gemfile = File . join ( rspec_rails_repo_path , 'Gemfile-rails-dependencies' )
15
17
# edge branches
16
18
gsub_file 'Gemfile' , /^.*\b gem 'rails.*$/ , ''
17
19
20
+ # Nokogiri version is pinned in rspec-rails' Gemfile since it tend to cause installation problems
21
+ # on Travis CI, so we pin nokogiri in this example app also.
22
+ append_to_file 'Gemfile' , "gem 'nokogiri', '#{ Nokogiri ::VERSION } '\n "
23
+
18
24
# Use our version of RSpec and Rails
19
25
append_to_file 'Gemfile' , <<-EOT . gsub ( /^ +\| / , '' )
20
26
|# Rack::Cache 1.3.0 requires Ruby >= 2.0.0
You can’t perform that action at this time.
0 commit comments