fat_free_crm 0.12.3 → 0.13.0

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

@@ -21,15 +21,10 @@ describe "/home/options" do
 
     render
 
-    rendered.should have_rjs("options") do |rjs|
-      with_tag("input[type=hidden]") # current_user
-
-      user_menu = "onLoading:function(request){$('user').update('all users'); " +
-                  "$('loading').show()}, parameters:'user=all_users'}); } } }"
-      with_tag("script", /#{Regexp.escape(user_menu)}/)
-    end
-    rendered.should include('crm.flip_form("options")')
-    rendered.should include('crm.set_title("title", "Recent Activity Options")')
+    rendered.should include("jQuery('#options').html")
+    rendered.should include("onLoading:function(request){$(\\'asset\\').update(\\'campaign\\'); $(\\'loading\\').show()}")
+    rendered.should include("crm.flip_form('options')")
+    rendered.should include("crm.set_title('title', 'Recent Activity Options')")
   end
 
   it "should load :options partial with JavaScript code for menus" do
@@ -49,8 +44,8 @@ describe "/home/options" do
     params[:cancel] = "true"
     render
 
-    rendered.should_not have_rjs("options")
-    rendered.should include('crm.flip_form("options")')
-    rendered.should include('crm.set_title("title", "Recent Activity")')
+    rendered.should_not include("jQuery('#options').html")
+    rendered.should include("crm.flip_form('options')")
+    rendered.should include("crm.set_title('title', 'Recent Activity')")
   end
 end

data/spec/views/leads/{convert.rjs_spec.rb → convert.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 "/leads/convert" do
   include LeadsHelper
@@ -22,9 +22,7 @@ describe "/leads/convert" do
     params[:cancel] = "true"
 
     render
-    rendered.should have_rjs("lead_#{@lead.id}") do |rjs|
-      with_tag("li[id=lead_#{@lead.id}]")
-    end
+    rendered.should include("jQuery('#lead_#{@lead.id}').replaceWith('<li class=\\'highlight lead\\' id=\\'lead_#{@lead.id}\\'")
   end
 
   it "cancel from lead landing page: should hide [Convert Lead] form" do
@@ -32,7 +30,7 @@ describe "/leads/convert" do
     params[:cancel] = "true"
 
     render
-    rendered.should include('crm.flip_form("convert_lead"')
+    rendered.should include("crm.flip_form('convert_lead'")
   end
 
   it "convert: should hide previously open [Convert Lead] and replace it with lead partial" do
@@ -40,9 +38,7 @@ describe "/leads/convert" do
     assign(:previous, previous = FactoryGirl.create(:lead, :user => current_user))
 
     render
-    rendered.should have_rjs("lead_#{previous.id}") do |rjs|
-      with_tag("li[id=lead_#{previous.id}]")
-    end
+    rendered.should include("jQuery('#lead_#{previous.id}').replaceWith")
   end
 
   it "convert: should remove previously open [Convert Lead] if it's no longer available" do
@@ -50,29 +46,25 @@ describe "/leads/convert" do
     assign(:previous, previous = 41)
 
     render
-    rendered.should include(%Q/crm.flick("lead_#{previous}", "remove");/)
+    rendered.should include("crm.flick('lead_#{previous}', 'remove');")
   end
 
   it "convert from leads index page: should turn off highlight, hide [Create Lead] form, and replace current lead with [Convert Lead] form" do
     params[:cancel] = nil
 
     render
-    rendered.should include(%Q/crm.highlight_off("lead_#{@lead.id}");/)
-    rendered.should include('crm.hide_form("create_lead")')
-    rendered.should have_rjs("lead_#{@lead.id}") do |rjs|
-      with_tag("form[class=edit_lead]")
-    end
+    rendered.should include("crm.highlight_off('lead_#{@lead.id}');")
+    rendered.should include("crm.hide_form('create_lead')")
+    rendered.should include("jQuery('#lead_#{@lead.id}').html")
   end
 
   it "convert from lead landing page: should hide [Edit Lead] and show [Convert Lead] form" do
     params[:cancel] = "false"
 
     render
-    rendered.should have_rjs("convert_lead") do |rjs|
-      with_tag("form[class=edit_lead]")
-    end
-    rendered.should include('crm.hide_form("edit_lead"')
-    rendered.should include('crm.flip_form("convert_lead"')
+    rendered.should include("#convert_lead")
+    rendered.should include("crm.hide_form('edit_lead'")
+    rendered.should include("crm.flip_form('convert_lead'")
   end
 
   it "convert: should handle new or existing account and set up calendar field" do
@@ -80,7 +72,7 @@ describe "/leads/convert" do
 
     render
     rendered.should include("crm.create_or_select_account")
-    rendered.should include('$("account_name").focus()')
+    rendered.should include('focus()')
   end
 
 end

data/spec/views/leads/{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 "/leads/create" do
   before do
@@ -22,28 +22,25 @@ describe "/leads/create" do
     it "should hide [Create Lead] form and insert lead partial" do
       render
 
-      rendered.should have_rjs(:insert, :top) do |rjs|
-        with_tag("li[id=lead_#{@lead.id}]")
-      end
-      rendered.should include(%Q/$("lead_#{@lead.id}").visualEffect("highlight"/)
+      rendered.should include("jQuery('#leads').prepend('<li class=\\'highlight lead\\' id=\\'lead_#{@lead.id}\\'")
+      rendered.should include(%Q/jQuery('#lead_#{@lead.id}').effect("highlight"/)
     end
 
     it "should update sidebar when called from leads index" do
       controller.request.env["HTTP_REFERER"] = "http://localhost/leads"
       render
 
-      rendered.should have_rjs("sidebar") do |rjs|
-        with_tag("div[id=filters]")
-        with_tag("div[id=recently]")
-      end
-      rendered.should include('$("filters").visualEffect("shake"')
+      rendered.should include("#sidebar")
+      rendered.should have_text("Lead Statuses")
+      rendered.should include("Recent Items")
+      rendered.should include("jQuery('#filters').effect('shake'")
     end
 
     it "should update pagination when called from leads index" do
       controller.request.env["HTTP_REFERER"] = "http://localhost/leads"
       render
 
-      rendered.should have_rjs("paginate")
+      rendered.should include("#paginate")
     end
 
     it "should update related asset sidebar from related asset" do
@@ -51,10 +48,9 @@ describe "/leads/create" do
       controller.request.env["HTTP_REFERER"] = "http://localhost/campaigns/#{campaign.id}"
       render
 
-      rendered.should have_rjs("sidebar") do |rjs|
-        with_tag("div[class=panel][id=summary]")
-        with_tag("div[class=panel][id=recently]")
-      end
+      rendered.should include("#sidebar")
+      rendered.should have_text("Campaign Summary")
+      rendered.should have_text("Recent Items")
     end
   end
 
@@ -65,10 +61,8 @@ describe "/leads/create" do
 
       render
 
-      rendered.should have_rjs("create_lead") do |rjs|
-        with_tag("form[class=new_lead]")
-      end
-      rendered.should include('$("create_lead").visualEffect("shake"')
+      rendered.should include("jQuery('#create_lead').html")
+      rendered.should include(%Q/jQuery('#create_lead').effect("shake"/)
     end
   end
 end

data/spec/views/leads/{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 "/leads/destroy" do
   before do
@@ -14,7 +14,7 @@ describe "/leads/destroy" do
 
   it "should blind up destroyed lead partial" do
     render
-    rendered.should include(%Q/$("lead_#{@lead.id}").visualEffect("blind_up"/)
+    rendered.should include("slideUp")
   end
 
   it "should update leads sidebar when called from leads index" do
@@ -22,10 +22,9 @@ describe "/leads/destroy" do
     controller.request.env["HTTP_REFERER"] = "http://localhost/leads"
     render
 
-    rendered.should have_rjs("sidebar") do |rjs|
-      with_tag("div[id=recently]")
-    end
-    rendered.should include('$("filters").visualEffect("shake"')
+    rendered.should include("#sidebar")
+    rendered.should have_text("Recent Items")
+    rendered.should include("jQuery('#filters').effect('shake'")
   end
 
   it "should update pagination when called from leads index" do
@@ -33,7 +32,7 @@ describe "/leads/destroy" do
     controller.request.env["HTTP_REFERER"] = "http://localhost/leads"
     render
 
-    rendered.should have_rjs("paginate")
+    rendered.should include("#paginate")
   end
 
   it "should update related asset sidebar when called from related asset" do
@@ -41,11 +40,9 @@ describe "/leads/destroy" do
     controller.request.env["HTTP_REFERER"] = "http://localhost/campaigns/#{campaign.id}"
     render
 
-    rendered.should have_rjs("sidebar") do |rjs|
-      with_tag("div[class=panel][id=summary]")
-      with_tag("div[class=panel][id=recently]")
-    end
+    rendered.should include("#sidebar")
+    rendered.should have_text("Campaign Summary")
+    rendered.should have_text("Recent Items")
   end
 
 end
-

data/spec/views/leads/{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 "/leads/edit" do
   include LeadsHelper
@@ -19,9 +19,7 @@ describe "/leads/edit" do
     params[:cancel] = "true"
 
     render
-    rendered.should have_rjs("lead_#{@lead.id}") do |rjs|
-      with_tag("li[id=lead_#{@lead.id}]")
-    end
+    rendered.should include("jQuery('#lead_#{@lead.id}').replaceWith('<li class=\\'highlight lead\\' id=\\'lead_#{@lead.id}\\'")
   end
 
   it "cancel from lead landing page: should hide [Edit Lead] form" do
@@ -29,7 +27,7 @@ describe "/leads/edit" do
     params[:cancel] = "true"
 
     render
-    rendered.should include('crm.flip_form("edit_lead"')
+    rendered.should include("crm.flip_form('edit_lead'")
   end
 
   it "edit: should hide previously open [Edit Lead] and replace it with lead partial" do
@@ -37,9 +35,7 @@ describe "/leads/edit" do
     assign(:previous, previous = FactoryGirl.create(:lead, :user => current_user))
 
     render
-    rendered.should have_rjs("lead_#{previous.id}") do |rjs|
-      with_tag("li[id=lead_#{previous.id}]")
-    end
+    rendered.should include("jQuery('#lead_#{previous.id}').replaceWith('<li class=\\'highlight lead\\' id=\\'lead_#{previous.id}\\'")
   end
 
   it "edit: should remove previously open [Edit Lead] if it's no longer available" do
@@ -47,29 +43,25 @@ describe "/leads/edit" do
     assign(:previous, previous = 41)
 
     render
-    rendered.should include(%Q/crm.flick("lead_#{previous}", "remove");/)
+    rendered.should include("crm.flick('lead_#{previous}', 'remove');")
   end
 
   it "edit from leads index page: should turn off highlight, hide [Create Lead] form, and replace current lead with [Edit Lead] form" do
     params[:cancel] = nil
 
     render
-    rendered.should include(%Q/crm.highlight_off("lead_#{@lead.id}");/)
-    rendered.should include('crm.hide_form("create_lead")')
-    rendered.should have_rjs("lead_#{@lead.id}") do |rjs|
-      with_tag("form[class=edit_lead]")
-    end
+    rendered.should include("crm.highlight_off('lead_#{@lead.id}');")
+    rendered.should include("crm.hide_form('create_lead')")
+    rendered.should include("jQuery('#lead_#{@lead.id}').html")
   end
 
   it "edit from lead landing page: should hide [Convert Lead] and show [Edit Lead] form" do
     params[:cancel] = "false"
 
     render
-    rendered.should have_rjs("edit_lead") do |rjs|
-      with_tag("form[class=edit_lead]")
-    end
-    rendered.should include('crm.hide_form("convert_lead"')
-    rendered.should include('crm.flip_form("edit_lead"')
+    rendered.should include("jQuery('#edit_lead').html")
+    rendered.should include("crm.hide_form('convert_lead'")
+    rendered.should include("crm.flip_form('edit_lead'")
   end
 
   it "edit from lead landing page: should not attempt to hide [Convert Lead] if the lead is already converted" do
@@ -77,7 +69,7 @@ describe "/leads/edit" do
     assign(:lead, FactoryGirl.create(:lead, :status => "converted", :user => current_user))
 
     render
-    rendered.should_not include('crm.hide_form("convert_lead"')
+    rendered.should_not include("crm.hide_form('convert_lead'")
   end
 
 end

data/spec/views/leads/{index.rjs_spec.rb → index.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 "/leads/index" do
   include LeadsHelper
@@ -17,10 +17,8 @@ describe "/leads/index" do
 
     render :template => 'leads/index', :formats => [:js]
     
-    rendered.should have_rjs("leads") do |rjs|
-      with_tag("li[id=lead_#{42}]")
-    end
-    rendered.should have_rjs("paginate")
+    rendered.should include("jQuery('#leads').html('<li class=\\'highlight lead\\' id=\\'lead_42\\'")
+    rendered.should include("#paginate")
   end
 
   it "should render [empty] template if @leads collection if there are no leads" do
@@ -28,10 +26,8 @@ describe "/leads/index" do
 
     render :template => 'leads/index', :formats => [:js]
     
-    rendered.should have_rjs("leads") do |rjs|
-      with_tag("div[id=empty]")
-    end
-    rendered.should have_rjs("paginate")
+    rendered.should include("jQuery('#leads').html('<div id=\\'empty\\'>")
+    rendered.should include("#paginate")
   end
 
 end

data/spec/views/leads/{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 "/leads/new" do
   include LeadsHelper
@@ -20,7 +20,7 @@ describe "/leads/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 lead" do
@@ -28,10 +28,8 @@ describe "/leads/new" do
       params[:cancel] = nil
       render
 
-      rendered.should have_rjs("create_lead") do |rjs|
-        with_tag("form[class=new_lead]")
-      end
-      rendered.should include('crm.flip_form("create_lead")')
+      rendered.should include("jQuery('#create_lead').html")
+      rendered.should include("crm.flip_form('create_lead')")
     end
   end
 
@@ -40,8 +38,8 @@ describe "/leads/new" do
       params[:cancel] = "true"
       render
 
-      rendered.should_not have_rjs("create_lead")
-      rendered.should include('crm.flip_form("create_lead");')
+      rendered.should_not include("#create_lead")
+      rendered.should include("crm.flip_form('create_lead');")
     end
   end
 

data/spec/views/leads/{promote.rjs_spec.rb → promote.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 "/leads/promote" do
   before do
@@ -28,17 +28,16 @@ describe "/leads/promote" do
 
       it "should flip [Convert Lead] form" do
         render
-        rendered.should_not have_rjs("lead_#{@lead.id}")
-        rendered.should include('crm.flip_form("convert_lead"')
+        rendered.should_not include("lead_#{@lead.id}")
+        rendered.should include("crm.flip_form('convert_lead'")
       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("Lead Summary")
+        rendered.should have_text("Recent Items")
+        rendered.should include("jQuery('#summary').effect('shake'")
       end
     end
 
@@ -47,21 +46,18 @@ describe "/leads/promote" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/leads"
       end
 
-      it "should replace [Convert Lead] with lead partial and highligh it" do
+      it "should replace [Convert Lead] with lead partial and highlight it" do
         render
-        rendered.should have_rjs("lead_#{@lead.id}") do |rjs|
-          with_tag("li[id=lead_#{@lead.id}]")
-        end
-        rendered.should include(%Q/$("lead_#{@lead.id}").visualEffect("highlight"/)
+        rendered.should include("jQuery('#lead_#{@lead.id}').replaceWith('<li class=\\'highlight lead\\' id=\\'lead_#{@lead.id}\\'")
+        rendered.should include("jQuery('#filters').effect('shake'")
       end
 
       it "should update sidebar" do
         render
-        rendered.should have_rjs("sidebar") do |rjs|
-          with_tag("div[id=filters]")
-          with_tag("div[id=recently]")
-        end
-        rendered.should include('$("filters").visualEffect("shake"')
+        rendered.should include("#sidebar")
+        rendered.should have_text("Lead Status")
+        rendered.should have_text("Recent Items")
+        rendered.should include("jQuery('#filters').effect('shake'")
       end
     end
 
@@ -73,29 +69,24 @@ describe "/leads/promote" do
         assign(:opportunity, @opportunity = FactoryGirl.create(:opportunity))
       end
 
-      it "should replace [Convert Lead] with lead partial and highligh it" do
+      it "should replace [Convert Lead] with lead partial and highlight it" do
         render
-        rendered.should have_rjs("lead_#{@lead.id}") do |rjs|
-          with_tag("li[id=lead_#{@lead.id}]")
-        end
-        rendered.should include(%Q/$("lead_#{@lead.id}").visualEffect("highlight"/)
+        rendered.should include("jQuery('#lead_#{@lead.id}').replaceWith('<li class=\\'highlight lead\\' id=\\'lead_#{@lead.id}\\'")
+        rendered.should include(%Q/jQuery('#lead_#{@lead.id}').effect("highlight"/)
       end
 
       it "should update campaign sidebar" do
         render
 
-        rendered.should have_rjs("sidebar") do |rjs|
-          with_tag("div[class=panel][id=summary]")
-          with_tag("div[class=panel][id=recently]")
-        end
+        rendered.should include("#sidebar")
+        rendered.should have_text("Summary")
+        rendered.should have_text("Recent Items")
       end
 
       it "should insert new opportunity if any" do
         render
 
-        rendered.should have_rjs(:insert, :top) do |rjs|
-          with_tag("li[id=opportunity_#{@opportunity.id}]")
-        end
+        rendered.should include("jQuery('#opportunities').prepend('<li class=\\'highlight opportunity\\' id=\\'opportunity_#{@opportunity.id}")
       end
 
     end
@@ -113,10 +104,8 @@ describe "/leads/promote" do
 
       it "should redraw the [Convert Lead] form and shake it" do
         render
-        rendered.should have_rjs("convert_lead") do |rjs|
-          with_tag("form[class=edit_lead]")
-        end
-        rendered.should include(%Q/$("convert_lead").visualEffect("shake"/)
+        rendered.should include("jQuery('#convert_lead').html")
+        rendered.should include(%Q/jQuery('#convert_lead').effect("shake"/)
       end
     end
 
@@ -127,10 +116,8 @@ describe "/leads/promote" do
 
       it "should redraw the [Convert Lead] form and shake it" do
         render
-        rendered.should have_rjs("lead_#{@lead.id}") do |rjs|
-          with_tag("form[class=edit_lead]")
-        end
-        rendered.should include(%Q/$("lead_#{@lead.id}").visualEffect("shake"/)
+        rendered.should include("jQuery('#lead_#{@lead.id}').html")
+        rendered.should include(%Q/jQuery('#lead_#{@lead.id}').effect("shake"/)
       end
     end
 
@@ -141,17 +128,15 @@ describe "/leads/promote" do
 
       it "should redraw the [Convert Lead] form and shake it" do
         render
-        rendered.should have_rjs("lead_#{@lead.id}") do |rjs|
-          with_tag("form[class=edit_lead]")
-        end
-        rendered.should include(%Q/$("lead_#{@lead.id}").visualEffect("shake"/)
+        rendered.should include("jQuery('#lead_#{@lead.id}').html")
+        rendered.should include(%Q/jQuery('#lead_#{@lead.id}').effect("shake"/)
       end
     end
 
     it "should handle new or existing account and set up calendar field" do
       render
       rendered.should include("crm.create_or_select_account")
-      rendered.should include('$("account_name").focus()')
+      rendered.should include('focus()')
     end
   end # errors
 end