Improve test suite (#81)

svenfuchs · Mar 21, 2017 · 9586ec8 · 9586ec8
1 parent 247121c
commit 9586ec8
Show file tree

Hide file tree

Showing 14 changed files with 174 additions and 93 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 /pkg/
+.ruby-version
diff --git a/.travis.yml b/.travis.yml
@@ -19,17 +19,36 @@ rvm:
   - 1.9.3
   - 2.1
   - 2.2
+  - 2.3
 
 gemfile:
   - Gemfile
   - gemfiles/Gemfile.rails_3
   - gemfiles/Gemfile.rails_4
+  - gemfiles/Gemfile.rails_5
   - gemfiles/Gemfile.rails_master
 
 env:
   - PG_USER=postgres
 
 matrix:
-  allow_failures:
-    - rvm: 2.2
   fast_finish: true
+  exclude:
+    - rvm: 1.9.3
+      gemfile: Gemfile
+    - rvm: 2.1
+      gemfile: Gemfile
+    - rvm: 2.2
+      gemfile: Gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/Gemfile.rails_5
+    - rvm: 2.1
+      gemfile: gemfiles/Gemfile.rails_5
+    - rvm: 2.2
+      gemfile: gemfiles/Gemfile.rails_5
+    - rvm: 1.9.3
+      gemfile: gemfiles/Gemfile.rails_master
+    - rvm: 2.1
+      gemfile: gemfiles/Gemfile.rails_master
+    - rvm: 2.2
+      gemfile: gemfiles/Gemfile.rails_master
diff --git a/Gemfile b/Gemfile
@@ -4,7 +4,7 @@ gemspec
 
 gem 'activerecord'
 gem 'sqlite3'
-gem 'mysql'
+gem 'mysql2'
 gem 'pg'
 
 gem 'minitest'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -7,33 +7,30 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.5.1)
-      activesupport (= 4.2.5.1)
-      builder (~> 3.1)
-    activerecord (4.2.5.1)
-      activemodel (= 4.2.5.1)
-      activesupport (= 4.2.5.1)
-      arel (~> 6.0)
-    activesupport (4.2.5.1)
+    activemodel (5.0.2)
+      activesupport (= 5.0.2)
+    activerecord (5.0.2)
+      activemodel (= 5.0.2)
+      activesupport (= 5.0.2)
+      arel (~> 7.0)
+    activesupport (5.0.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.3)
-    builder (3.2.2)
-    i18n (0.7.0)
-    json (1.8.3)
+    arel (7.1.4)
+    concurrent-ruby (1.0.5)
+    i18n (0.8.1)
     metaclass (0.0.4)
-    minitest (5.8.4)
-    mocha (1.1.0)
+    minitest (5.10.1)
+    mocha (1.2.1)
       metaclass (~> 0.0.1)
-    mysql (2.9.1)
-    pg (0.18.4)
-    rake (11.1.1)
-    sqlite3 (1.3.11)
+    mysql2 (0.4.5)
+    pg (0.20.0)
+    rake (12.0.0)
+    sqlite3 (1.3.13)
     test_declarative (0.0.5)
-    thread_safe (0.3.5)
+    thread_safe (0.3.6)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
@@ -46,11 +43,11 @@ DEPENDENCIES
   i18n-active_record!
   minitest
   mocha
-  mysql
+  mysql2
   pg
   rake
   sqlite3
   test_declarative
 
 BUNDLED WITH
-   1.11.2
+   1.14.3
diff --git a/Rakefile b/Rakefile
@@ -34,7 +34,7 @@ namespace :bundle do
   end
 
   task :install_all do
-    [nil, '3', '4', 'master'].each do |ar|
+    [nil, '3', '4', '5', 'master'].each do |ar|
       opt = ar && "AR=#{ar}"
       execute "rake bundle:install #{opt}"
     end

diff --git a/gemfiles/Gemfile.rails_3 b/gemfiles/Gemfile.rails_3
@@ -4,8 +4,8 @@ gemspec path: '..'
 
 gem 'activerecord', '~> 3.2.0'
 gem 'sqlite3'
-gem 'mysql'
-gem 'pg'
+gem 'mysql2'
+gem 'pg', '~> 0.18.0'
 
 gem 'minitest'
 gem 'test_declarative'

diff --git a/gemfiles/Gemfile.rails_3.lock b/gemfiles/Gemfile.rails_3.lock
@@ -7,31 +7,31 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.2.22.2)
-      activesupport (= 3.2.22.2)
+    activemodel (3.2.22.5)
+      activesupport (= 3.2.22.5)
       builder (~> 3.0.0)
-    activerecord (3.2.22.2)
-      activemodel (= 3.2.22.2)
-      activesupport (= 3.2.22.2)
+    activerecord (3.2.22.5)
+      activemodel (= 3.2.22.5)
+      activesupport (= 3.2.22.5)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.22.2)
+    activesupport (3.2.22.5)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     arel (3.0.3)
     builder (3.0.4)
-    i18n (0.7.0)
+    i18n (0.8.1)
     metaclass (0.0.4)
-    minitest (5.8.4)
-    mocha (1.1.0)
+    minitest (5.10.1)
+    mocha (1.2.1)
       metaclass (~> 0.0.1)
-    multi_json (1.11.2)
-    mysql (2.9.1)
+    multi_json (1.12.1)
+    mysql2 (0.4.5)
     pg (0.18.4)
-    rake (11.1.1)
-    sqlite3 (1.3.11)
+    rake (12.0.0)
+    sqlite3 (1.3.13)
     test_declarative (0.0.5)
-    tzinfo (0.3.46)
+    tzinfo (0.3.52)
 
 PLATFORMS
   ruby
@@ -42,11 +42,11 @@ DEPENDENCIES
   i18n-active_record!
   minitest
   mocha
-  mysql
-  pg
+  mysql2
+  pg (~> 0.18.0)
   rake
   sqlite3
   test_declarative
 
 BUNDLED WITH
-   1.11.2
+   1.14.3
diff --git a/gemfiles/Gemfile.rails_4 b/gemfiles/Gemfile.rails_4
@@ -4,8 +4,8 @@ gemspec path: '..'
 
 gem 'activerecord', '~> 4.2.0'
 gem 'sqlite3'
-gem 'mysql'
-gem 'pg'
+gem 'mysql2'
+gem 'pg', '~> 0.18.0'
 
 gem 'minitest'
 gem 'test_declarative'

diff --git a/gemfiles/Gemfile.rails_4.lock b/gemfiles/Gemfile.rails_4.lock
@@ -7,33 +7,31 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.5.2)
-      activesupport (= 4.2.5.2)
+    activemodel (4.2.8)
+      activesupport (= 4.2.8)
       builder (~> 3.1)
-    activerecord (4.2.5.2)
-      activemodel (= 4.2.5.2)
-      activesupport (= 4.2.5.2)
+    activerecord (4.2.8)
+      activemodel (= 4.2.8)
+      activesupport (= 4.2.8)
       arel (~> 6.0)
-    activesupport (4.2.5.2)
+    activesupport (4.2.8)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.3)
-    builder (3.2.2)
-    i18n (0.7.0)
-    json (1.8.3)
+    arel (6.0.4)
+    builder (3.2.3)
+    i18n (0.8.1)
     metaclass (0.0.4)
-    minitest (5.8.4)
-    mocha (1.1.0)
+    minitest (5.10.1)
+    mocha (1.2.1)
       metaclass (~> 0.0.1)
-    mysql (2.9.1)
+    mysql2 (0.4.5)
     pg (0.18.4)
-    rake (11.1.1)
-    sqlite3 (1.3.11)
+    rake (12.0.0)
+    sqlite3 (1.3.13)
     test_declarative (0.0.5)
-    thread_safe (0.3.5)
+    thread_safe (0.3.6)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
 
@@ -46,11 +44,11 @@ DEPENDENCIES
   i18n-active_record!
   minitest
   mocha
-  mysql
-  pg
+  mysql2
+  pg (~> 0.18.0)
   rake
   sqlite3
   test_declarative
 
 BUNDLED WITH
-   1.11.2
+   1.14.3
diff --git a/gemfiles/Gemfile.rails_5 b/gemfiles/Gemfile.rails_5
@@ -0,0 +1,13 @@
+source 'https://rubygems.org'
+
+gemspec path: '..'
+
+gem 'activerecord', '~> 5.0.0'
+gem 'sqlite3'
+gem 'mysql2'
+gem 'pg'
+
+gem 'minitest'
+gem 'test_declarative'
+gem 'mocha'
+gem 'rake'
diff --git a/gemfiles/Gemfile.rails_5.lock b/gemfiles/Gemfile.rails_5.lock
@@ -0,0 +1,53 @@
+PATH
+  remote: ..
+  specs:
+    i18n-active_record (0.1.2)
+      i18n (>= 0.5.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.0.2)
+      activesupport (= 5.0.2)
+    activerecord (5.0.2)
+      activemodel (= 5.0.2)
+      activesupport (= 5.0.2)
+      arel (~> 7.0)
+    activesupport (5.0.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (7.1.4)
+    concurrent-ruby (1.0.5)
+    i18n (0.8.1)
+    metaclass (0.0.4)
+    minitest (5.10.1)
+    mocha (1.2.1)
+      metaclass (~> 0.0.1)
+    mysql2 (0.4.5)
+    pg (0.20.0)
+    rake (12.0.0)
+    sqlite3 (1.3.13)
+    test_declarative (0.0.5)
+    thread_safe (0.3.6)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 5.0.0)
+  bundler
+  i18n-active_record!
+  minitest
+  mocha
+  mysql2
+  pg
+  rake
+  sqlite3
+  test_declarative
+
+BUNDLED WITH
+   1.14.3
diff --git a/gemfiles/Gemfile.rails_master b/gemfiles/Gemfile.rails_master
@@ -2,9 +2,9 @@ source 'https://rubygems.org'
 
 gemspec path: '..'
 
-gem 'activerecord', github: 'rails/rails', branch: 'master'
+gem 'activerecord', git: 'https://github.com/rails/rails', branch: 'master'
 gem 'sqlite3'
-gem 'mysql'
+gem 'mysql2'
 gem 'pg'
 
 gem 'minitest'