has_moderated 1.0.rc2 → 1.0.rc3

data/test/dummy/spec/models/task_spec.rb

@@ -1,5 +1,12 @@
 require File.expand_path('../../spec_helper', __FILE__)
 
+def reload_task_subtask
+  Object.send(:remove_const, 'Task') if defined? Task
+  load 'task.rb'
+  Object.send(:remove_const, 'Subtask') if defined? Subtask
+  load 'subtask.rb'
+end
+
 describe Task do
   
   #
@@ -9,10 +16,7 @@ describe Task do
   
   context "has_many association:" do
     before do
-      Object.send(:remove_const, 'Task') if defined? Task
-      load 'task.rb'
-      Object.send(:remove_const, 'Subtask') if defined? Subtask
-      load 'subtask.rb'
+      reload_task_subtask
       Task.has_many :renamed_subtasks, :class_name => "Subtask"
       Task.has_moderated_association :renamed_subtasks
     end
@@ -121,10 +125,7 @@ describe Task do
   
   context "has_many polymorphic association:" do
     before do
-      Object.send(:remove_const, 'Task') if defined? Task
-      load 'task.rb'
-      Object.send(:remove_const, 'Subtask') if defined? Subtask
-      load 'subtask.rb'
+      reload_task_subtask
       Task.has_many :renamed_subtasks, :class_name => "Subtask", :as => :parentable
       Subtask.belongs_to :parentable, :polymorphic => true
       Task.has_moderated_association :renamed_subtasks
@@ -155,10 +156,7 @@ describe Task do
   
   context "has_one polymorphic association:" do
     before do
-      Object.send(:remove_const, 'Task') if defined? Task
-      load 'task.rb'
-      Object.send(:remove_const, 'Subtask') if defined? Subtask
-      load 'subtask.rb'
+      reload_task_subtask
       Task.has_one :renamed_subtask, :class_name => "Subtask", :as => :parentable
       Subtask.belongs_to :parentable, :polymorphic => true
       Task.has_moderated_association :renamed_subtask
@@ -190,10 +188,7 @@ describe Task do
   
   context "has_and_belongs_to_many association:" do
     before do
-      Object.send(:remove_const, 'Task')
-      load 'task.rb'
-      Object.send(:remove_const, 'Subtask')
-      load 'subtask.rb'
+      reload_task_subtask
       Task.has_and_belongs_to_many :renamed_subtasks, :class_name => "Subtask", :join_table => "tasks_jointable", :foreign_key => "m1_id", :association_foreign_key => "m2_id"
       Subtask.has_and_belongs_to_many :renamed_tasks, :class_name => "Task", :join_table => "tasks_jointable", :foreign_key => "m2_id", :association_foreign_key => "m1_id"
       Task.has_moderated_association :renamed_subtasks
@@ -234,18 +229,34 @@ describe Task do
     end
   end
   context "has_and_belongs_to_many association (create moderation):" do
-    before do
-      Object.send(:remove_const, 'Task')
-      load 'task.rb'
-      Object.send(:remove_const, 'Subtask')
-      load 'subtask.rb'
+    before :each do # important that we do this before EACH
+      reload_task_subtask
       Task.has_moderated_create :with_associations => [:renamed_subtasks]
       Task.has_and_belongs_to_many :renamed_subtasks, :class_name => "Subtask", :join_table => "tasks_jointable", :foreign_key => "m1_id", :association_foreign_key => "m2_id"
       Subtask.has_and_belongs_to_many :renamed_tasks, :class_name => "Task", :join_table => "tasks_jointable", :foreign_key => "m2_id", :association_foreign_key => "m1_id"
-      Task.has_moderated_association :renamed_subtasks
     end
     
-    it "associates an existing subtask on create" do
+    it "associates an existing subtask on create 1" do
+      Task.has_moderated_association :renamed_subtasks  # important difference (had different behavior based
+                                                        # on presence of this line, need to test with and without)
+      Subtask.create! :title => "Subtask 1"
+      Subtask.count.should eq(1)
+      Moderation.count.should eq(0)
+      
+      task = Task.new :title => "Task 1"
+      task.renamed_subtasks << Subtask.first
+      task.save
+      
+      Moderation.count.should eq(1)
+      Moderation.last.accept
+      Moderation.count.should eq(0)
+      
+      Task.first.renamed_subtasks.count.should eq(1)
+      subtask = Task.first.renamed_subtasks.first
+      subtask.title.should eq("Subtask 1")
+    end
+    
+    it "associates an existing subtask on create 2", :focus => true do
       Subtask.create! :title => "Subtask 1"
       Subtask.count.should eq(1)
       Moderation.count.should eq(0)
@@ -271,10 +282,7 @@ describe Task do
   
   context "has_many :through association:" do
     before do
-      Object.send(:remove_const, 'Task')  if defined? Task
-      load 'task.rb'
-      Object.send(:remove_const, 'Subtask') if defined? Subtask
-      load 'subtask.rb'
+      reload_task_subtask
       Task.has_many :renamed_connections, :class_name => "TaskConnection", :foreign_key => "m1_id"
       Task.has_many :renamed_subtasks, :class_name => "Subtask", :through => :renamed_connections, :source => :renamed_subtask
       Subtask.has_many :renamed_connections, :class_name => "TaskConnection", :foreign_key => "m2_id"
@@ -364,10 +372,7 @@ describe Task do
   
   context "has_one association:" do
     before do
-      Object.send(:remove_const, 'Task')
-      load 'task.rb'
-      Object.send(:remove_const, 'Subtask')
-      load 'subtask.rb'
+      reload_task_subtask
       Task.has_one :renamed_subtask, :class_name => "Subtask"
       Task.has_moderated_association :renamed_subtask
     end
@@ -430,10 +435,7 @@ describe Task do
   
   context "create moderation with association:" do
     before do
-      Object.send(:remove_const, 'Task')
-      load 'task.rb'
-      Object.send(:remove_const, 'Subtask')
-      load 'subtask.rb'
+      reload_task_subtask
       Task.has_many :renamed_subtasks, :class_name => "Subtask"
       Task.has_moderated_create :with_associations => [:renamed_subtasks]
     end
@@ -467,10 +469,7 @@ describe Task do
   
   context "destroy moderation:" do
     before do
-      Object.send(:remove_const, 'Task')
-      load 'task.rb'
-      Object.send(:remove_const, 'Subtask')
-      load 'subtask.rb'
+      reload_task_subtask
       Task.has_moderated_destroy
     end
     
@@ -490,10 +489,7 @@ describe Task do
   
   context "moderates attributes:" do
     before do
-      Object.send(:remove_const, 'Task')
-      load 'task.rb'
-      Object.send(:remove_const, 'Subtask')
-      load 'subtask.rb'
+      reload_task_subtask
       Task.has_moderated :title
     end
     
@@ -515,10 +511,7 @@ describe Task do
   
   context "common features:" do
     it "get_moderation_attributes can be overriden in model" do
-      Object.send(:remove_const, 'Task')
-      load 'task.rb'
-      Object.send(:remove_const, 'Subtask')
-      load 'subtask.rb'
+      reload_task_subtask
       Task.has_moderated_create
       Task.class_eval do
         def get_moderation_attributes
@@ -534,10 +527,7 @@ describe Task do
     end
     
     it "knows if it's a create moderation" do
-      Object.send(:remove_const, 'Task')
-      load 'task.rb'
-      Object.send(:remove_const, 'Subtask')
-      load 'subtask.rb'
+      reload_task_subtask
       Task.has_moderated_create
       
       Task.create! :title => "Task 1"
@@ -548,10 +538,7 @@ describe Task do
     end
     
     it "knows if it's a destroy moderation" do
-      Object.send(:remove_const, 'Task')
-      load 'task.rb'
-      Object.send(:remove_const, 'Subtask')
-      load 'subtask.rb'
+      reload_task_subtask
       Task.has_moderated_destroy
       
       Task.create! :title => "Task 1"
@@ -565,10 +552,7 @@ describe Task do
   
   context "hooks:" do
     before do
-      Object.send(:remove_const, 'Task')
-      load 'task.rb'
-      Object.send(:remove_const, 'Subtask')
-      load 'subtask.rb'
+      reload_task_subtask
       Task.has_moderated :title
       Task.moderation_creating do |moderation|
         moderation.data = "Test!"
@@ -584,8 +568,7 @@ describe Task do
   
   context "preview:" do
     before do
-      Object.send(:remove_const, 'Task')
-      load 'task.rb'
+      reload_task_subtask
       Task.has_moderated :title
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_moderated
 version: !ruby/object:Gem::Version
-  version: 1.0.rc2
+  version: 1.0.rc3
   prerelease: 4
 platform: ruby
 authors:
@@ -265,7 +265,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2683879995284600772
+      hash: -754626760659402804
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: