Merge pull request #403 from arthurnn/fix_tables_tests

Fix table names on tests

.gitignore

@@ -3,7 +3,7 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
+*.lock
 InstalledFiles
 _yardoc
 coverage

.travis.yml

@@ -6,6 +6,7 @@ rvm:
   - rbx-19mode
 gemfile:
   - Gemfile
+  - Gemfile.rails3
   - Gemfile.edge
 notifications:
   email: false

Gemfile

@@ -6,3 +6,5 @@ gemspec
 gem 'sqlite3'
 gem 'coveralls', :require => false
 gem 'simplecov', :require => false
+
+gem 'rails', "~> 4.0.0"

Gemfile.rails3

@@ -0,0 +1,11 @@
+source 'https://rubygems.org'
+
+# Specify gem dependencies in active_model_serializers.gemspec
+gemspec
+
+gem 'minitest'
+gem 'sqlite3'
+gem 'coveralls', :require => false
+gem 'simplecov', :require => false
+
+gem 'rails', "~> 3.2"

test/fixtures/active_record.rb

@@ -38,13 +38,13 @@
 
 class ARPost < ActiveRecord::Base
   has_many :ar_comments, class_name: 'ARComment'
-  has_and_belongs_to_many :ar_tags, class_name: 'ARTag'
+  has_and_belongs_to_many :ar_tags, class_name: 'ARTag', join_table: :ar_posts_tags
   belongs_to :ar_section, class_name: 'ARSection'
 end
 
 class ARComment < ActiveRecord::Base
   belongs_to :ar_post, class_name: 'ARPost'
-  has_and_belongs_to_many :ar_tags, class_name: 'ARTag'
+  has_and_belongs_to_many :ar_tags, class_name: 'ARTag', join_table: :ar_comments_tags
 end
 
 class ARTag < ActiveRecord::Base

test/test_helper.rb

@@ -1,6 +1,6 @@
 require 'bundler/setup'
 require 'coverage_setup'
-require 'test/unit'
+require 'minitest/autorun'
 require 'active_model_serializers'
 require 'fixtures/poro'