fat_free_crm 0.12.3 → 0.13.0

data/spec/views/comments/{new.rjs_spec.rb → edit.js.haml_spec.rb}

@@ -3,24 +3,27 @@
 # Fat Free CRM is freely distributable under the terms of MIT license.
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
-describe "/comments/new" do
+describe "/comments/edit" do
   include CommentsHelper
 
   before do
     assign(:comment, stub_model(Comment,
-      :new_record? => true
+      :id => 321,
+      :new_record? => false,
+      :commentable => stub_model(Contact, :id => '123')
+    ))
+    #params["contact_id"] = "123"
+    assign(:current_user, stub_model(User,
+      :email => 'test@example.com'
     ))
-    assign(:commentable, "contact")
-    params["contact_id"] = "123"
   end
 
-  it "should render new form" do
+  it "should render edit form" do
     render
 
-    rendered.should include("hide()")
-    rendered.should include("show()")
+    rendered.should include("textarea")
+    rendered.should include("123")
   end
 end
-

data/spec/views/contacts/{create.rjs_spec.rb → create.js.haml_spec.rb}

@@ -3,7 +3,7 @@
 # Fat Free CRM is freely distributable under the terms of MIT license.
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 describe "/contacts/create" do
   include ContactsHelper
@@ -21,34 +21,29 @@ describe "/contacts/create" do
     it "should hide [Create Contact] form and insert contact partial" do
       render
 
-      rendered.should have_rjs(:insert, :top) do |rjs|
-        with_tag("li[id=contact_#{@contact.id}]")
-      end
-      rendered.should include(%Q/$("contact_#{@contact.id}").visualEffect("highlight"/)
+      rendered.should include("jQuery('#contacts').prepend('<li class=\\'contact highlight\\' id=\\'contact_#{@contact.id}\\'")
+      rendered.should include(%Q/jQuery('#contact_#{@contact.id}').effect("highlight"/)
     end
 
     it "should refresh sidebar when called from contacts index" do
       controller.request.env["HTTP_REFERER"] = "http://localhost/contacts"
       render
 
-      rendered.should have_rjs("sidebar") do |rjs|
-        with_tag("div[id=recently]")
-      end
+      rendered.should include("#sidebar")
+      rendered.should have_text("Recent Items")
     end
 
     it "should update pagination when called from contacts index" do
       controller.request.env["HTTP_REFERER"] = "http://localhost/contacts"
       render
 
-      rendered.should have_rjs("paginate")
+      rendered.should include("#paginate")
     end
 
     it "should update recently viewed items when called from related asset" do
       render
 
-      rendered.should have_rjs("recently") do |rjs|
-        with_tag("div[class=caption]")
-      end
+      rendered.should include("#recently")
     end
   end
 
@@ -62,10 +57,8 @@ describe "/contacts/create" do
 
       render
 
-      rendered.should have_rjs("create_contact") do |rjs|
-        with_tag("form[class=new_contact]")
-      end
-      rendered.should include('visualEffect("shake"')
+      rendered.should include("jQuery('#create_contact').html")
+      rendered.should include(%Q/jQuery('#create_contact').effect("shake"/)
     end
   end
 

data/spec/views/contacts/{destroy.rjs_spec.rb → destroy.js.haml_spec.rb}

@@ -3,7 +3,7 @@
 # Fat Free CRM is freely distributable under the terms of MIT license.
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 describe "/contacts/destroy" do
   include ContactsHelper
@@ -16,31 +16,29 @@ describe "/contacts/destroy" do
 
   it "should blind up destroyed contact partial" do
     render
-    rendered.should include(%Q/$("contact_#{@contact.id}").visualEffect("blind_up"/)
+    rendered.should include("slideUp")
   end
 
   it "should update contacts sidebar when called from contacts index" do
     controller.request.env["HTTP_REFERER"] = "http://localhost/contacts"
     render
 
-    rendered.should have_rjs("sidebar") do |rjs|
-      with_tag("div[id=recently]")
-    end
+    rendered.should include("#sidebar")
+    rendered.should have_text("Recent Items")
   end
 
   it "should update pagination when called from contacts index" do
     controller.request.env["HTTP_REFERER"] = "http://localhost/contacts"
     render
 
-    rendered.should have_rjs("paginate")
+    rendered.should include("#paginate")
   end
 
   it "should update recently viewed items when called from related asset" do
     controller.request.env["HTTP_REFERER"] = "http://localhost/accounts/123"
     render
 
-    rendered.should have_rjs("recently")
+    rendered.should include("#recently")
   end
 
 end
-

data/spec/views/contacts/{edit.rjs_spec.rb → edit.js.haml_spec.rb}

@@ -3,7 +3,7 @@
 # Fat Free CRM is freely distributable under the terms of MIT license.
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 describe "/contacts/edit" do
   include ContactsHelper
@@ -20,9 +20,7 @@ describe "/contacts/edit" do
     params[:cancel] = "true"
 
     render
-    rendered.should have_rjs("contact_#{@contact.id}") do |rjs|
-      with_tag("li[id=contact_#{@contact.id}]")
-    end
+    rendered.should include("jQuery('#contact_#{@contact.id}').replaceWith('<li class=\\'contact highlight\\' id=\\'contact_#{@contact.id}\\'")
   end
 
   it "cancel from contact landing page: should hide [Edit Contact] form" do
@@ -30,7 +28,7 @@ describe "/contacts/edit" do
     params[:cancel] = "true"
 
     render
-    rendered.should include('crm.flip_form("edit_contact"')
+    rendered.should include("crm.flip_form('edit_contact'")
   end
 
   it "edit: should hide previously open [Edit Contact] for and replace it with contact partial" do
@@ -38,9 +36,7 @@ describe "/contacts/edit" do
     assign(:previous, previous = FactoryGirl.create(:contact, :user => current_user))
 
     render
-    rendered.should have_rjs("contact_#{previous.id}") do |rjs|
-      with_tag("li[id=contact_#{previous.id}]")
-    end
+    rendered.should include("jQuery('#contact_#{previous.id}').replaceWith")
   end
 
   it "edit: should hide and remove previously open [Edit Contact] if it's no longer available" do
@@ -48,34 +44,31 @@ describe "/contacts/edit" do
     assign(:previous, previous = 41)
 
     render
-    rendered.should include(%Q/crm.flick("contact_#{previous}", "remove");/)
+    rendered.should include("crm.flick('contact_#{previous}', 'remove');")
   end
 
   it "edit from contacts index page: should turn off highlight, hide [Create Contact] form, and replace current contact with [Edit Contact] form" do
     params[:cancel] = nil
 
     render
-    rendered.should include(%Q/crm.highlight_off("contact_#{@contact.id}");/)
-    rendered.should include('crm.hide_form("create_contact")')
-    rendered.should have_rjs("contact_#{@contact.id}") do |rjs|
-      with_tag("form[class=edit_contact]")
-    end
+    rendered.should include("crm.highlight_off('contact_#{@contact.id}');")
+    rendered.should include("crm.hide_form('create_contact')")
+    rendered.should include("jQuery('#contact_#{@contact.id}').html")
+    rendered.should include("crm.create_or_select_account(false)")
   end
 
   it "edit from contact landing page: should show [Edit Contact] form" do
     params[:cancel] = "false"
 
     render
-    rendered.should have_rjs("edit_contact") do |rjs|
-      with_tag("form[class=edit_contact]")
-    end
-    rendered.should include('crm.flip_form("edit_contact"')
+    rendered.should include("jQuery('#edit_contact').html")
+    rendered.should include("crm.flip_form('edit_contact'")
   end
 
   it "should show handle new or existing account for the contact" do
 
     render
-    rendered.should include("crm.create_or_select_account")
+    rendered.should include("crm.create_or_select_account(false)")
   end
 
 end

data/spec/views/contacts/index.haml_spec.rb

@@ -3,7 +3,7 @@
 # Fat Free CRM is freely distributable under the terms of MIT license.
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 describe "/contacts/index" do
   include ContactsHelper

data/spec/views/contacts/{index.rjs_spec.rb → index.js.html_spec.rb}

@@ -3,7 +3,7 @@
 # Fat Free CRM is freely distributable under the terms of MIT license.
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 describe "/contacts/index" do
   include ContactsHelper
@@ -16,22 +16,18 @@ describe "/contacts/index" do
     assign(:contacts, [ FactoryGirl.create(:contact, :id => 42) ].paginate)
 
     render :template => 'contacts/index', :formats => [:js]
-    
-    rendered.should have_rjs("contacts") do |rjs|
-      with_tag("li[id=contact_#{42}]")
-    end
-    rendered.should have_rjs("paginate")
+
+    rendered.should include("jQuery('#contacts').html('<li class=\\'contact highlight\\' id=\\'contact_42\\'")
+    rendered.should include("#paginate")
   end
 
   it "should render [empty] template if @contacts collection if there are no contacts" do
     assign(:contacts, [].paginate)
 
     render :template => 'contacts/index', :formats => [:js]
-    
-    rendered.should have_rjs("contacts") do |rjs|
-      with_tag("div[id=empty]")
-    end
-    rendered.should have_rjs("paginate")
+
+    rendered.should include("jQuery('#contacts').html('<div id=\\'empty\\'>")
+    rendered.should include("#paginate")
   end
 
 end

data/spec/views/contacts/{new.rjs_spec.rb → new.js.haml_spec.rb}

@@ -3,7 +3,7 @@
 # Fat Free CRM is freely distributable under the terms of MIT license.
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 describe "/contacts/new" do
   include ContactsHelper
@@ -20,7 +20,7 @@ describe "/contacts/new" do
   it "should toggle empty message div if it exists" do
     render
 
-    rendered.should include('crm.flick("empty", "toggle")')
+    rendered.should include("crm.flick('empty', 'toggle')")
   end
 
   describe "new contact" do
@@ -28,9 +28,8 @@ describe "/contacts/new" do
       params[:cancel] = nil
       render
 
-      rendered.should have_rjs("create_contact") do |rjs|
-        with_tag("form[class=new_contact]")
-      end
+      rendered.should include("jQuery('#create_contact').html")
+      rendered.should include("crm.create_or_select_account(false)")
     end
   end
 
@@ -39,8 +38,8 @@ describe "/contacts/new" do
       params[:cancel] = "true"
       render
 
-      rendered.should_not have_rjs("create_contact")
-      rendered.should include('crm.flip_form("create_contact");')
+      rendered.should_not include("jQuery('#create_contact').html")
+      rendered.should include("crm.flip_form('create_contact');")
     end
   end
 

data/spec/views/contacts/{update.rjs_spec.rb → update.js.haml_spec.rb}

@@ -3,7 +3,7 @@
 # Fat Free CRM is freely distributable under the terms of MIT license.
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require 'spec_helper'
 
 describe "/contacts/update" do
   include ContactsHelper
@@ -25,16 +25,14 @@ describe "/contacts/update" do
 
       it "should flip [edit_contact] form" do
         render
-        rendered.should_not have_rjs("contact_#{@contact.id}")
+        rendered.should_not include("contact_#{@contact.id}")
       end
 
       it "should update sidebar" do
         render
-        rendered.should have_rjs("sidebar") do |rjs|
-          with_tag("div[id=summary]")
-          with_tag("div[id=recently]")
-        end
-        rendered.should include('$("summary").visualEffect("shake"')
+        rendered.should include("#sidebar")
+        rendered.should have_text("Recent Items")
+        rendered.should include("jQuery('#summary').effect('shake'")
       end
     end
 
@@ -43,21 +41,18 @@ describe "/contacts/update" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/contacts"
       end
 
-      it "should replace [Edit Contact] with contact partial and highligh it" do
+      it "should replace [Edit Contact] with contact partial and highlight it" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/contacts"
 
         render
-        rendered.should have_rjs("contact_#{@contact.id}") do |rjs|
-          with_tag("li[id=contact_#{@contact.id}]")
-        end
-        rendered.should include(%Q/$("contact_#{@contact.id}").visualEffect("highlight"/)
+        rendered.should include("jQuery('#contact_#{@contact.id}').replaceWith('<li class=\\'contact highlight\\' id=\\'contact_#{@contact.id}\\'")
+        rendered.should include(%Q/jQuery('#contact_#{@contact.id}').effect("highlight"/)
       end
 
       it "should update sidebar" do
         render
-        rendered.should have_rjs("sidebar") do |rjs|
-          with_tag("div[id=recently]")
-        end
+        rendered.should include("#sidebar")
+        rendered.should have_text("Recent Items")
       end
     end
 
@@ -66,21 +61,17 @@ describe "/contacts/update" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/accounts/123"
       end
 
-      it "should replace [Edit Contact] with contact partial and highligh it" do
+      it "should replace [Edit Contact] with contact partial and highlight it" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/contacts"
 
         render
-        rendered.should have_rjs("contact_#{@contact.id}") do |rjs|
-          with_tag("li[id=contact_#{@contact.id}]")
-        end
-        rendered.should include(%Q/$("contact_#{@contact.id}").visualEffect("highlight"/)
+        rendered.should include("jQuery('#contact_#{@contact.id}').replaceWith('<li class=\\'contact highlight\\' id=\\'contact_#{@contact.id}\\'")
+        rendered.should include(%Q/jQuery('#contact_#{@contact.id}').effect("highlight"/)
       end
 
       it "should update recently viewed items" do
         render
-        rendered.should have_rjs("recently") do |rjs|
-          with_tag("div[class=caption]")
-        end
+        rendered.should include("#recently")
       end
     end
   end # no errors
@@ -97,11 +88,9 @@ describe "/contacts/update" do
 
       it "should redraw the [edit_contact] form and shake it" do
         render
-        rendered.should have_rjs("edit_contact") do |rjs|
-          with_tag("form[class=edit_contact]")
-        end
+        rendered.should include("jQuery('#edit_contact').html")
         rendered.should include('crm.create_or_select_account(false)')
-        rendered.should include('$("edit_contact").visualEffect("shake"')
+        rendered.should include(%Q/jQuery('#edit_contact').effect("shake"/)
         rendered.should include('focus()')
       end
     end
@@ -113,11 +102,9 @@ describe "/contacts/update" do
 
       it "should redraw the [edit_contact] form and shake it" do
         render
-        rendered.should have_rjs("contact_#{@contact.id}") do |rjs|
-          with_tag("form[class=edit_contact]")
-        end
+        rendered.should include("jQuery('#contact_#{@contact.id}').html")
         rendered.should include('crm.create_or_select_account(false)')
-        rendered.should include(%Q/$("contact_#{@contact.id}").visualEffect("shake"/)
+        rendered.should include(%Q/jQuery('#contact_#{@contact.id}').effect("shake"/)
         rendered.should include('focus()')
       end
     end
@@ -134,10 +121,8 @@ describe "/contacts/update" do
 
       it "should redraw the [edit_contact] form and shake it" do
         render
-        rendered.should have_rjs("contact_#{@contact.id}") do |rjs|
-          with_tag("form[class=edit_contact]")
-        end
-        rendered.should include(%Q/$("contact_#{@contact.id}").visualEffect("shake"/)
+        rendered.should include("jQuery('#contact_#{@contact.id}').html")
+        rendered.should include(%Q/jQuery('#contact_#{@contact.id}').effect("shake"/)
         rendered.should include('focus()')
       end
     end

data/spec/views/home/{index.rjs_spec.rb → index.js.haml_spec.rb}

@@ -17,9 +17,8 @@ describe "/home/index" do
 
     render :template => 'home/index', :formats => [:js]
 
-    rendered.should have_rjs("activities") do |rjs|
-      with_tag("li[id=version_42]")
-    end
+    rendered.should include("jQuery('#activities').html")
+    rendered.should include("li class=\\'version\\' id=\\'version_42\\'")
   end
 
   it "should render a message if there're no activities" do
@@ -27,7 +26,6 @@ describe "/home/index" do
 
     render :template => 'home/index', :formats => [:js]
 
-    rendered.should have_rjs("activities")
     rendered.should include("No activity records found.")
   end