Starts adressing #6 by fixing the test suite

mezis · Jul 13, 2013 · 5c35782 · 5c35782
1 parent e605a0b
commit 5c35782
Show file tree

Hide file tree

Showing 11 changed files with 296 additions and 100 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,5 +8,8 @@ gemfile:
   - gemfiles/rails31.gemfile
   - gemfiles/rails32.gemfile
   - gemfiles/rails32_pg.gemfile
+  - gemfiles/rails32_mysql.gemfile
 before_script:
   - psql -c 'create database fuzzily_test;' -U postgres
+  - mysql -e 'create database fuzzily_test;'
+env: TRAVIS=TRUE
diff --git a/Appraisals b/Appraisals
@@ -17,3 +17,7 @@ end
 appraise "rails32-pg" do
   gem "activerecord", "~> 3.2.0"
 end
+
+appraise "rails32-mysql" do
+  gem "activerecord", "~> 3.2.0"
+end
diff --git a/gemfiles/rails23.gemfile.lock b/gemfiles/rails23.gemfile.lock
@@ -10,38 +10,55 @@ GEM
     activerecord (2.3.17)
       activesupport (= 2.3.17)
     activesupport (2.3.17)
-    appraisal (0.5.1)
+    appraisal (0.5.2)
       bundler
       rake
     coderay (1.0.9)
-    diff-lcs (1.1.3)
+    colorize (0.5.8)
+    coveralls (0.6.7)
+      colorize
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      thor
+    diff-lcs (1.2.4)
     method_source (0.8.1)
+    mime-types (1.23)
+    multi_json (1.7.2)
     mysql2 (0.3.11)
-    pg (0.14.1)
-    pry (0.9.12)
+    pg (0.15.1)
+    pry (0.9.12.1)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
     pry-nav (0.2.3)
       pry (~> 0.9.10)
-    rake (10.0.3)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
-    slop (3.4.3)
+    rake (10.0.4)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    slop (3.4.4)
     sqlite3 (1.3.7)
+    thor (0.18.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activerecord (~> 2.3.0)
   appraisal
+  coveralls
   fuzzily!
   mysql2
   pg

diff --git a/gemfiles/rails30.gemfile.lock b/gemfiles/rails30.gemfile.lock
@@ -17,42 +17,59 @@ GEM
       arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
     activesupport (3.0.20)
-    appraisal (0.5.1)
+    appraisal (0.5.2)
       bundler
       rake
     arel (2.0.10)
     builder (2.1.2)
     coderay (1.0.9)
-    diff-lcs (1.1.3)
+    colorize (0.5.8)
+    coveralls (0.6.7)
+      colorize
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      thor
+    diff-lcs (1.2.4)
     i18n (0.5.0)
     method_source (0.8.1)
+    mime-types (1.23)
+    multi_json (1.7.2)
     mysql2 (0.3.11)
     pg (0.15.1)
-    pry (0.9.12)
+    pry (0.9.12.1)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
     pry-nav (0.2.3)
       pry (~> 0.9.10)
-    rake (10.0.3)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
-    slop (3.4.3)
+    rake (10.0.4)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    slop (3.4.4)
     sqlite3 (1.3.7)
-    tzinfo (0.3.35)
+    thor (0.18.1)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activerecord (~> 3.0.0)
   appraisal
+  coveralls
   fuzzily!
   mysql2
   pg

diff --git a/gemfiles/rails31.gemfile.lock b/gemfiles/rails31.gemfile.lock
@@ -18,43 +18,59 @@ GEM
       tzinfo (~> 0.3.29)
     activesupport (3.1.11)
       multi_json (~> 1.0)
-    appraisal (0.5.1)
+    appraisal (0.5.2)
       bundler
       rake
     arel (2.2.3)
     builder (3.0.4)
     coderay (1.0.9)
-    diff-lcs (1.1.3)
-    i18n (0.6.1)
+    colorize (0.5.8)
+    coveralls (0.6.7)
+      colorize
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      thor
+    diff-lcs (1.2.4)
+    i18n (0.6.4)
     method_source (0.8.1)
-    multi_json (1.6.1)
+    mime-types (1.23)
+    multi_json (1.7.2)
     mysql2 (0.3.11)
     pg (0.15.1)
-    pry (0.9.12)
+    pry (0.9.12.1)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
     pry-nav (0.2.3)
       pry (~> 0.9.10)
-    rake (10.0.3)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
-    slop (3.4.3)
+    rake (10.0.4)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    slop (3.4.4)
     sqlite3 (1.3.7)
-    tzinfo (0.3.35)
+    thor (0.18.1)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activerecord (~> 3.1.0)
   appraisal
+  coveralls
   fuzzily!
   mysql2
   pg

diff --git a/gemfiles/rails32.gemfile.lock b/gemfiles/rails32.gemfile.lock
@@ -7,54 +7,70 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (3.2.12)
-      activesupport (= 3.2.12)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activerecord (3.2.12)
-      activemodel (= 3.2.12)
-      activesupport (= 3.2.12)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.12)
-      i18n (~> 0.6)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
-    appraisal (0.5.1)
+    appraisal (0.5.2)
       bundler
       rake
     arel (3.0.2)
     builder (3.0.4)
     coderay (1.0.9)
-    diff-lcs (1.1.3)
+    colorize (0.5.8)
+    coveralls (0.6.7)
+      colorize
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      thor
+    diff-lcs (1.2.4)
     i18n (0.6.1)
     method_source (0.8.1)
-    multi_json (1.6.1)
+    mime-types (1.23)
+    multi_json (1.7.2)
     mysql2 (0.3.11)
     pg (0.15.1)
-    pry (0.9.12)
+    pry (0.9.12.1)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
     pry-nav (0.2.3)
       pry (~> 0.9.10)
-    rake (10.0.3)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.1)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.2)
-    slop (3.4.3)
+    rake (10.0.4)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    slop (3.4.4)
     sqlite3 (1.3.7)
-    tzinfo (0.3.35)
+    thor (0.18.1)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   activerecord (~> 3.2.0)
   appraisal
+  coveralls
   fuzzily!
   mysql2
   pg

diff --git a/gemfiles/rails32_mysql.gemfile b/gemfiles/rails32_mysql.gemfile
@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 3.2.0"
+
+gemspec :path=>"../"
+
+ENV['FUZZILY_ADAPTER'] = 'mysql'
+ENV['FUZZILY_DB_USER'] = ENV['TRAVIS'] ? 'travis' : 'root'