Merge pull request #180 from mezis/spec-fixes

Spec fixes

app/models/account.rb

@@ -2,7 +2,7 @@
 class Account < ActiveRecord::Base
   # attr_accessible :name, :auto_adopt, :domain, :categories
 
-  has_many :users, :dependent => :destroy
+  has_many :users, inverse_of: :account, :dependent => :destroy
   has_many :ideas
 
   validates_presence_of :name

app/models/login.rb

@@ -10,7 +10,7 @@ class Login < ActiveRecord::Base
     :trackable, :validatable,
     :omniauthable
 
-  has_many :users, dependent: :destroy
+  has_many :users,    inverse_of: :login, dependent: :destroy
   has_many :accounts, through: :users
 
   # attr_accessible :email, :password, :password_confirmation, :remember_me

app/models/user.rb

@@ -5,8 +5,8 @@ class User < ActiveRecord::Base
 
   # attr_accessible :karma, :account, :voting_power, :login_attributes, :login
 
-  belongs_to :login
-  belongs_to :account
+  belongs_to :login,   inverse_of: :users
+  belongs_to :account, inverse_of: :users
 
   has_many :ideas, :foreign_key => :author_id, :dependent => :destroy
   has_many :vettings, :dependent => :destroy

spec/observers/karma/comment_observer_spec.rb

@@ -3,13 +3,14 @@
 
 describe Karma::CommentObserver do
   context 'when a comment is posted' do
-    let(:author)  { User.make! }
-    let(:idea)    { Idea.make! }
-    let(:comment) { Comment.make! author: author, idea: idea }
+    fixtures :ideas, :users, :accounts, :logins
 
     it 'the commenter gains karma' do
-      idea # make sure the idea is created outside the 'should' block
-      lambda { comment }.should change(author, :karma).by(1)
+      idea   = ideas(:idea_submitted)
+      author = User.make!
+      lambda {
+        Comment.make! author: author, idea: idea
+      }.should change(author, :karma).by(1)
     end
   end
 end