Fix tests

Victor Costa
1 parent 308261af
Showing 3 changed files with 3 additions and 3 deletions Show diff stats
lib/gamification_plugin/badge.rb
test/unit/api_test.rb
test/unit/comment_test.rb
@@ -18,6 +18,6 @@ class GamificationPlugin::Badge &lt; ActiveRecord::Base
     Merit::BadgesSash.where(:badge_id => self.id).destroy_all
   end
  
-  scope :notification_pending, :include => :badges_sash, :conditions => {:badges_sashes => {:notified_user => false}}
+  scope :notification_pending, -> { includes(:badges_sash).where(:badges_sashes => {:notified_user => false}) }
  
 end
 require_relative '../test_helper'
-require_relative '../../../../test/unit/api/test_helper'
+require_relative '../../../../test/api/test_helper'
  
 class APITest <  ActiveSupport::TestCase
  
@@ -298,7 +298,7 @@ class CommentTest &lt; ActiveSupport::TestCase
     GamificationPlugin::Badge.create!(:owner => organization, :name => 'comment_author')
     GamificationPlugin.gamification_set_rules(environment)
     article.profile = organization
-
+    article.save!
     5.times { create(Comment, :source => article, :author_id => person.id) }
     assert_equal 'comment_author', person.badges.first.name
   end
...	...	@@ -18,6 +18,6 @@ class GamificationPlugin::Badge < ActiveRecord::Base
18	18	Merit::BadgesSash.where(:badge_id => self.id).destroy_all
19	19	end
20	20
21		- scope :notification_pending, :include => :badges_sash, :conditions => {:badges_sashes => {:notified_user => false}}
	21	+ scope :notification_pending, -> { includes(:badges_sash).where(:badges_sashes => {:notified_user => false}) }
22	22
23	23	end
...	...
1	1	require_relative '../test_helper'
2		-require_relative '../../../../test/unit/api/test_helper'
	2	+require_relative '../../../../test/api/test_helper'
3	3
4	4	class APITest < ActiveSupport::TestCase
5	5
...	...
...	...	@@ -298,7 +298,7 @@ class CommentTest < ActiveSupport::TestCase
298	298	GamificationPlugin::Badge.create!(:owner => organization, :name => 'comment_author')
299	299	GamificationPlugin.gamification_set_rules(environment)
300	300	article.profile = organization
301		-
	301	+ article.save!
302	302	5.times { create(Comment, :source => article, :author_id => person.id) }
303	303	assert_equal 'comment_author', person.badges.first.name
304	304	end
...	...