diff options
| -rw-r--r-- | app/models/discussion.rb | 2 | ||||
| -rw-r--r-- | app/models/message.rb | 2 | ||||
| -rw-r--r-- | inboxes.gemspec | 2 | ||||
| -rw-r--r-- | spec/fake_app.rb | 7 |
4 files changed, 8 insertions, 5 deletions
diff --git a/app/models/discussion.rb b/app/models/discussion.rb index cc18946..8eaeb82 100644 --- a/app/models/discussion.rb +++ b/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 diff --git a/app/models/message.rb b/app/models/message.rb index a0bddb7..f162ced 100644 --- a/app/models/message.rb +++ b/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) diff --git a/inboxes.gemspec b/inboxes.gemspec index a0ae874..aaed62e 100644 --- a/inboxes.gemspec +++ b/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'] diff --git a/spec/fake_app.rb b/spec/fake_app.rb index 7e9df7c..29c18dc 100644 --- a/spec/fake_app.rb +++ b/spec/fake_app.rb @@ -11,8 +11,11 @@ require 'devise' 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 |