tiny_mce: fix random failures with action tracker

Braulio Bhavamitra
1 parent 0588c69e
Showing 1 changed file with 17 additions and 20 deletions Show diff stats
test/unit/tiny_mce_article_test.rb
@@ -5,7 +5,8 @@ class TinyMceArticleTest &lt; ActiveSupport::TestCase
   def setup
     super
-    @profile = create_user('zezinho').person
+    @user = User.current = create_user('zezinho')
+    @profile = @user.person
   end
   attr_reader :profile
@@ -114,24 +115,22 @@ class TinyMceArticleTest &lt; ActiveSupport::TestCase
   should 'notify activity on create' do
     ActionTracker::Record.delete_all
-    create TinyMceArticle, :name => 'test', :profile_id => fast_create(Profile).id, :published => true
+    create TinyMceArticle, name: 'test', profile_id: profile.id, published: true
     assert_equal 1, ActionTracker::Record.count
   end
   should 'not group trackers activity of article\'s creation' do
     ActionTracker::Record.delete_all
-    profile = fast_create(Profile)
-    create TinyMceArticle, :name => 'bar', :profile_id => profile.id, :published => true
-    create TinyMceArticle, :name => 'another bar', :profile_id => profile.id, :published => true
+    create TinyMceArticle, name: 'bar', profile_id: profile.id, published: true
+    create TinyMceArticle, name: 'another bar', profile_id: profile.id, published: true
     assert_equal 2, ActionTracker::Record.count
-    create TinyMceArticle, :name => 'another bar', :profile_id => fast_create(Profile).id, :published => true
+    create TinyMceArticle, name: 'another bar 2', profile_id: profile.id, published: true
     assert_equal 3, ActionTracker::Record.count
   end
   should 'not update activity on update of an article' do
     ActionTracker::Record.delete_all
-    profile = fast_create(Profile)
-    article = create(TinyMceArticle, :profile_id => profile.id)
+    article = create TinyMceArticle, profile_id: profile.id
     time = article.activity.updated_at
     Time.stubs(:now).returns(time + 1.day)
     assert_no_difference 'ActionTracker::Record.count' do
@@ -143,8 +142,8 @@ class TinyMceArticleTest &lt; ActiveSupport::TestCase
   should 'not create trackers activity when updating articles' do
     ActionTracker::Record.delete_all
-    a1 = create TinyMceArticle, :name => 'bar', :profile_id => fast_create(Profile).id, :published => true
-    a2 = create TinyMceArticle, :name => 'another bar', :profile_id => fast_create(Profile).id, :published => true
+    a1 = create TinyMceArticle, name: 'bar', profile_id: profile.id, published: true
+    a2 = create TinyMceArticle, name: 'another bar', profile_id: profile.id, published: true
     assert_no_difference 'ActionTracker::Record.count' do
       a1.name = 'foo';a1.save!
       a2.name = 'another foo';a2.save!
@@ -153,34 +152,32 @@ class TinyMceArticleTest &lt; ActiveSupport::TestCase
   should 'remove activity when an article is destroyed' do
     ActionTracker::Record.delete_all
-    a1 = create TinyMceArticle, :name => 'bar', :profile_id => fast_create(Profile).id, :published => true
-    a2 = create TinyMceArticle, :name => 'another bar', :profile_id => fast_create(Profile).id, :published => true
+    a1 = create TinyMceArticle, name: 'bar', profile_id: profile.id, published: true
+    a2 = create TinyMceArticle, name: 'another bar', profile_id: profile.id, published: true
     assert_difference 'ActionTracker::Record.count', -2 do
       a1.destroy
       a2.destroy
-end
+    end
   end
   should "the tracker action target be defined as the article on articles'creation in communities" do
     ActionTracker::Record.delete_all
     community = fast_create(Community)
-    p1 = Person.first
-    community.add_member(p1)
-    assert p1.is_member_of?(community)
-    article = create TinyMceArticle, :name => 'test', :profile_id => community.id
+    community.add_member profile
+    assert profile.is_member_of?(community)
+    article = create TinyMceArticle, name: 'test', profile_id: community.id
     assert_equal article, ActionTracker::Record.last.target
   end
   should "the tracker action target be defined as the article on articles'creation in profile" do
     ActionTracker::Record.delete_all
-    person = Person.first
-    article = create TinyMceArticle, :name => 'test', :profile_id => person.id
+    article = create TinyMceArticle, name: 'test', profile_id: profile.id
     assert_equal article, ActionTracker::Record.last.target
   end
   should 'not notify activity if the article is not advertise' do
     ActionTracker::Record.delete_all
-    a = create TinyMceArticle, :name => 'bar', :profile_id => fast_create(Profile).id, :published => true, :advertise => false
+    a = create TinyMceArticle, name: 'bar', profile_id: profile.id, published: true, advertise: false
     assert_equal true, a.published?
     assert_equal true, a.notifiable?
     assert_equal false, a.image?