Skip to content

Commit

Permalink
Fix e2e fixtures and 1.9.3 unit tests (#538)
Browse files Browse the repository at this point in the history
* Test fixes: Fix Hashdiff version to run on 1.9.3

* Test fixes: Ensure correct sqlite3 version is requested
  • Loading branch information
Cawllec authored Apr 29, 2019
1 parent 30d7aae commit eaef01a
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ group :test, optional: true do
gem 'delayed_job' if RUBY_VERSION >= '2.2.2'
gem 'i18n', RUBY_VERSION <= '2.3.0' ? '1.4.0': '>1.4.0' if RUBY_VERSION >= '2.2.2'
gem 'webmock', RUBY_VERSION <= '1.9.3' ? '2.3.2': '>2.3.2'
gem 'hashdiff', RUBY_VERSION <= '1.9.3' ? '0.3.8': '>0.3.8'
end

group :coverage, optional: true do
Expand Down
2 changes: 1 addition & 1 deletion features/fixtures/rails3/app/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ gem 'rails', '3.2.22.5'

gem 'nokogiri', '1.6.8'

gem 'sqlite3'
gem 'sqlite3', '< 1.4'

gem 'jquery-rails'

Expand Down
2 changes: 1 addition & 1 deletion features/fixtures/rails4/app/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source 'https://rubygems.org'
gem 'rails', '~>4'

# Use sqlite3 as the database for Active Record
gem 'sqlite3'
gem 'sqlite3', '< 1.4'

# Use SCSS for stylesheets
gem 'sass-rails', '~> 4.0.0'
Expand Down
2 changes: 1 addition & 1 deletion features/fixtures/rails5/app/Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ source 'https://rubygems.org'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.0.0'
# Use sqlite3 as the database for Active Record
gem 'sqlite3'
gem 'sqlite3', '< 1.4'
# Use Puma as the app server
gem 'puma', '~> 3.0'
# Use SCSS for stylesheets
Expand Down

0 comments on commit eaef01a

Please sign in to comment.