Fixing test failture

app/models/discussion.rb

@@ -1,7 +1,7 @@
 class Discussion < ActiveRecord::Base
   attr_accessor :recipient_tokens, :recipient_ids
   attr_reader :recipient_ids
-  attr_accessible :recipient_tokens, :messages_attributes
+  attr_accessible :recipient_tokens, :messages_attributes, :user, :recipient_ids
 
   # creater
   has_many :messages, :dependent => :destroy

app/models/message.rb

@@ -1,6 +1,6 @@
 class Message < ActiveRecord::Base
 
-  attr_accessible :body
+  attr_accessible :body, :user, :discussion
 
   default_scope order(:created_at)
 

inboxes.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "pg"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency 'rspec', ['>= 0']
-  s.add_development_dependency 'factory_girl_rails'
+  s.add_development_dependency 'factory_girl_rails', ['>= 2.6']
   s.add_development_dependency 'rspec-rails', ['>= 0']
   # s.add_development_dependency 'rr', ['>= 0']
   # s.add_development_dependency 'steak', ['>= 0']

spec/fake_app.rb

@@ -11,8 +11,11 @@
 require 'devise/orm/active_record'
 
 # database
-ActiveRecord::Base.configurations = {'test' => {:adapter => 'postgresql', :database => 'inboxes_test', :username => "postgres"}}
-# ActiveRecord::Base.configurations = {'test' => {:adapter => 'sqlite3', :database => ':memory:'}}
+if ENV['TRAVIS'].present?
+  ActiveRecord::Base.configurations = {'test' => {:adapter => 'postgresql', :database => 'inboxes_test', :username => "postgres"}}
+else
+  ActiveRecord::Base.configurations = {'test' => {:adapter => 'sqlite3', :database => ':memory:'}}
+end
 ActiveRecord::Base.establish_connection('test')
 
 # config