Skip to content

Commit

Permalink
Testing fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
straydogstudio committed Sep 20, 2019
1 parent 8dbbda1 commit e11adb8
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 11 deletions.
20 changes: 16 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,22 @@ spec/dummy_4/db/*.sqlite3
spec/dummy_4/log/*.log
spec/dummy_4/tmp/
spec/dummy_4/.sass-cache
spec/dummy_5/db/*.sqlite3
spec/dummy_5/log/*.log
spec/dummy_5/tmp/
spec/dummy_5/.sass-cache
spec/dummy_5.0/db/*.sqlite3
spec/dummy_5.0/log/*.log
spec/dummy_5.0/tmp/
spec/dummy_5.0/.sass-cache
spec/dummy_5.1/db/*.sqlite3
spec/dummy_5.1/log/*.log
spec/dummy_5.1/tmp/
spec/dummy_5.1/.sass-cache
spec/dummy_5.2/db/*.sqlite3
spec/dummy_5.2/log/*.log
spec/dummy_5.2/tmp/
spec/dummy_5.2/.sass-cache
spec/dummy_6.0/db/*.sqlite3
spec/dummy_6.0/log/*.log
spec/dummy_6.0/tmp/
spec/dummy_6.0/.sass-cache
oo_*/
tags
.DS_Store
Expand Down
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ when '5.2'
gem 'rails', "~> 5.2"
gem 'responders', '~> 3.0'
when '5.1'
gem 'rails', "~> 5.1.0"
gem 'rails', "~> 5.1"
gem 'responders', '~> 3.0'
when '5.0'
gem 'rails', "~> 5.0"
Expand All @@ -34,7 +34,7 @@ end
# jquery-rails is used by the dummy application
gem "jquery-rails"
gem "thin"
gem "sqlite3"
gem "sqlite3", '~> 1.4', :platform => [:ruby, :mswin, :mingw]

# Declare any dependencies that are still in development here instead of in
# your gemspec. These might include edge Rails or gems from your path or
Expand Down
4 changes: 2 additions & 2 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
puts "Testing Rails 5.1"
require File.expand_path("../dummy_5.1/config/environment", __FILE__)
elsif ENV['RAILS_VERSION'] =~ /^5/
puts "Testing Rails 5"
require File.expand_path("../dummy_5/config/environment", __FILE__)
puts "Testing Rails 5.0"
require File.expand_path("../dummy_5.0/config/environment", __FILE__)
elsif ENV['RAILS_VERSION'] =~ /^4/
puts "Testing Rails 4"
require File.expand_path("../dummy_4/config/environment", __FILE__)
Expand Down
2 changes: 1 addition & 1 deletion spec/test_5.0.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ do
echo Reusing Gemfile.lock.$version
cp Gemfile.lock.$version Gemfile.lock
fi
rm spec/dummy_5/db/test.sqlite3
rm spec/dummy_5.0/db/test.sqlite3
export RAILS_VERSION=$version
spec/ci.rb
cp Gemfile.lock Gemfile.lock.$version
Expand Down
5 changes: 3 additions & 2 deletions spec/test_all_rails.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
spec/test_3.1.sh
spec/test_3.2.sh
spec/test_4.0.sh
spec/test_5.0.sh
spec/test_5.1.sh
spec/test_5.2.sh
spec/test_6.0.sh

cp Gemfile.lock.orig Gemfile.lock
Expand Down

0 comments on commit e11adb8

Please sign in to comment.