fat_free_crm 0.12.3 → 0.13.0

data/spec/views/leads/{reject.rjs_spec.rb → reject.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/reject" do
   before do
@@ -15,29 +15,23 @@ describe "/leads/reject" do
   it "should refresh current lead partial" 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 sidebar filters when called from index page" do
     controller.request.env["HTTP_REFERER"] = "http://localhost/leads"
     render
 
-    rendered.should have_rjs("sidebar") do |rjs|
-      with_tag("div[id=filters]")
-    end
-    rendered.should include('$("filters").visualEffect("shake"')
+    rendered.should include("jQuery('#sidebar').html")
+    rendered.should include("jQuery('#filters').effect('shake'")
   end
 
   it "should update sidebar summary when called from landing page" do
     render
 
-    rendered.should have_rjs("sidebar") do |rjs|
-      with_tag("div[id=summary]")
-    end
-    rendered.should include('$("summary").visualEffect("shake"')
+    rendered.should include("jQuery('#sidebar').html")
+    rendered.should include("jQuery('#summary').effect('shake'")
   end
 
   it "should update campaign sidebar if called from campaign landing page" do
@@ -45,10 +39,9 @@ describe "/leads/reject" 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("Summary")
+    rendered.should have_text("Recent Items")
   end
 
 end

data/spec/views/leads/{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 "/leads/update" do
   before do
@@ -22,16 +22,15 @@ describe "/leads/update" do
 
       it "should flip [edit_lead] form" do
         render
-        rendered.should_not have_rjs("lead_#{@lead.id}")
-        rendered.should include('crm.flip_form("edit_lead"')
+        rendered.should_not include("lead_#{@lead.id}x")
+        rendered.should include("crm.flip_form('edit_lead'")
       end
 
       it "should update sidebar" do
         render
-        rendered.should have_rjs("sidebar") do |rjs|
-          with_tag("div[id=summary]")
-        end
-        rendered.should include('$("summary").visualEffect("shake"')
+        rendered.should include("#sidebar")
+        rendered.should have_text("Lead Summary")
+        rendered.should include("jQuery('#summary').effect('shake'")
       end
     end
 
@@ -40,21 +39,18 @@ describe "/leads/update" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/leads"
       end
 
-      it "should replace [Edit Lead] with lead partial and highligh it" do
+      it "should replace [Edit 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 Statuses")
+        rendered.should have_text("Recent Items")
+        rendered.should include("jQuery('#filters').effect('shake'")
       end
     end
 
@@ -64,22 +60,19 @@ describe "/leads/update" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/campaigns/123"
       end
 
-      it "should replace [Edit Lead] with lead partial and highligh it" do
+      it "should replace [Edit 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
         assign(:campaign, campaign = FactoryGirl.create(:campaign))
         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
 
@@ -97,10 +90,8 @@ describe "/leads/update" do
 
       it "should redraw the [edit_lead] form and shake it" do
         render
-        rendered.should have_rjs("edit_lead") do |rjs|
-          with_tag("form[class=edit_lead]")
-        end
-        rendered.should include('$("edit_lead").visualEffect("shake"')
+        rendered.should include("#edit_lead")
+        rendered.should include(%Q/jQuery('#edit_lead').effect("shake"/)
         rendered.should include('focus()')
       end
     end
@@ -112,10 +103,8 @@ describe "/leads/update" do
 
       it "should redraw the [edit_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"/)
         rendered.should include('focus()')
       end
     end
@@ -127,10 +116,8 @@ describe "/leads/update" do
 
       it "should redraw the [edit_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"/)
         rendered.should include('focus()')
       end
     end

data/spec/views/opportunities/{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 "/opportunities/create" do
   before do
@@ -21,27 +21,24 @@ describe "/opportunities/create" do
     it "should hide [Create Opportunity] form and insert opportunity partial" do
       render
 
-      rendered.should have_rjs(:insert, :top) do |rjs|
-        with_tag("li[id=opportunity_#{@opportunity.id}]")
-      end
-      rendered.should include(%Q/$("opportunity_#{@opportunity.id}").visualEffect("highlight"/)
+      rendered.should include("jQuery('#opportunities').prepend('<li class=\\'highlight opportunity\\' id=\\'opportunity_#{@opportunity.id}\\'")
+      rendered.should include(%Q/jQuery('#opportunity_#{@opportunity.id}').effect("highlight"/)
     end
 
     it "should update sidebar filters and recently viewed items when called from opportunities page" do
       controller.request.env["HTTP_REFERER"] = "http://localhost/opportunities"
       render
 
-      rendered.should have_rjs("sidebar") do |rjs|
-        with_tag("div[id=filters]")
-        with_tag("div[id=recently]")
-      end
+      rendered.should include("#sidebar")
+      rendered.should have_text("Opportunity Stages")
+      rendered.should have_text("Recent Items")
     end
 
     it "should update pagination when called from opportunities index" do
       controller.request.env["HTTP_REFERER"] = "http://localhost/opportunities"
       render
 
-      rendered.should have_rjs("paginate")
+      rendered.should include("#paginate")
     end
 
     it "should update related account sidebar when called from related account" do
@@ -49,10 +46,8 @@ describe "/opportunities/create" do
       controller.request.env["HTTP_REFERER"] = "http://localhost/accounts/#{account.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("Recent Items")
     end
 
     it "should update related campaign sidebar when called from related campaign" do
@@ -60,19 +55,16 @@ describe "/opportunities/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
 
     it "should update sidebar when called from related contact" do
       controller.request.env["HTTP_REFERER"] = "http://localhost/contacts/123"
       render
 
-      rendered.should have_rjs("recently") do |rjs|
-        with_tag("div[class=caption]")
-      end
+      rendered.should include("#recently")
     end
   end
 
@@ -86,11 +78,9 @@ describe "/opportunities/create" do
 
       render
 
-      rendered.should have_rjs("create_opportunity") do |rjs|
-        with_tag("form[class=new_opportunity]")
-      end
-      rendered.should include('$("create_opportunity").visualEffect("shake"')
-      rendered.should include("crm.create_or_select_account")
+      rendered.should include("jQuery('#create_opportunity').html")
+      rendered.should include(%Q/jQuery('#create_opportunity').effect("shake"/)
+      rendered.should include("crm.create_or_select_account(false)")
     end
   end
 

data/spec/views/opportunities/{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 "/opportunities/destroy" do
   before do
@@ -15,7 +15,7 @@ describe "/opportunities/destroy" do
 
   it "should blind up destroyed opportunity partial" do
     render
-    rendered.should include(%Q/$("opportunity_#{@opportunity.id}").visualEffect("blind_up"/)
+    rendered.should include("slideUp")
   end
 
   it "should update opportunities sidebar when called from opportunities index" do
@@ -23,10 +23,9 @@ describe "/opportunities/destroy" do
     controller.request.env["HTTP_REFERER"] = "http://localhost/opportunities"
     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 opportunities index" do
@@ -34,7 +33,7 @@ describe "/opportunities/destroy" do
     controller.request.env["HTTP_REFERER"] = "http://localhost/opportunities"
     render
 
-    rendered.should have_rjs("paginate")
+    rendered.should include("#paginate")
   end
 
   it "should update related account sidebar when called from related account" do
@@ -42,10 +41,9 @@ describe "/opportunities/destroy" do
     controller.request.env["HTTP_REFERER"] = "http://localhost/accounts/#{account.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("Account Summary")
+    rendered.should have_text("Recent Items")
   end
 
   it "should update related campaign sidebar when called from related campaign" do
@@ -53,17 +51,16 @@ describe "/opportunities/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
 
   it "should update recently viewed items when called from related contact" do
     controller.request.env["HTTP_REFERER"] = "http://localhost/contacts/123"
     render
 
-    rendered.should have_rjs("recently")
+    rendered.should include("#recently")
   end
 
 end

data/spec/views/opportunities/{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 "/opportunities/edit" do
   include OpportunitiesHelper
@@ -22,9 +22,7 @@ describe "/opportunities/edit" do
     params[:cancel] = "true"
 
     render
-    rendered.should have_rjs("opportunity_#{@opportunity.id}") do |rjs|
-      with_tag("li[id=opportunity_#{@opportunity.id}]")
-    end
+    rendered.should include("jQuery('#opportunity_#{@opportunity.id}').replaceWith")
   end
 
   it "cancel from opportunity landing page: should hide [Edit Opportunity] form" do
@@ -32,7 +30,7 @@ describe "/opportunities/edit" do
     params[:cancel] = "true"
 
     render
-    rendered.should include('crm.flip_form("edit_opportunity"')
+    rendered.should include("crm.flip_form('edit_opportunity'")
   end
 
   it "edit: should hide previously open [Edit Opportunity] for and replace it with opportunity partial" do
@@ -40,9 +38,7 @@ describe "/opportunities/edit" do
     assign(:previous, previous = FactoryGirl.create(:opportunity, :user => current_user))
 
     render
-    rendered.should have_rjs("opportunity_#{previous.id}") do |rjs|
-      with_tag("li[id=opportunity_#{previous.id}]")
-    end
+    rendered.should include("jQuery('#opportunity_#{previous.id}').replaceWith")
   end
 
   it "edit: remove previously open [Edit Opportunity] if it's no longer available" do
@@ -50,28 +46,24 @@ describe "/opportunities/edit" do
     assign(:previous, previous = 41)
 
     render
-    rendered.should include(%Q/crm.flick("opportunity_#{previous}", "remove");/)
+    rendered.should include("crm.flick('opportunity_#{previous}', 'remove');")
   end
 
   it "edit from opportunities index page: should turn off highlight, hide [Create Opportunity] form, and replace current opportunity with [Edit Opportunity] form" do
     params[:cancel] = nil
 
     render
-    rendered.should include(%Q/crm.highlight_off("opportunity_#{@opportunity.id}");/)
-    rendered.should include('crm.hide_form("create_opportunity")')
-    rendered.should have_rjs("opportunity_#{@opportunity.id}") do |rjs|
-      with_tag("form[class=edit_opportunity]")
-    end
+    rendered.should include("crm.highlight_off('opportunity_#{@opportunity.id}');")
+    rendered.should include("crm.hide_form('create_opportunity')")
+    rendered.should include("jQuery('#opportunity_#{@opportunity.id}').html")
   end
 
   it "edit from opportunity landing page: should show [Edit Opportunity] form" do
     params[:cancel] = "false"
 
     render
-    rendered.should have_rjs("edit_opportunity") do |rjs|
-      with_tag("form[class=edit_opportunity]")
-    end
-    rendered.should include('crm.flip_form("edit_opportunity"')
+    rendered.should include("jQuery('#edit_opportunity').html")
+    rendered.should include("crm.flip_form('edit_opportunity'")
   end
 
   it "edit: should handle new or existing account for the opportunity" do

data/spec/views/opportunities/{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 "/opportunities/index" do
   include OpportunitiesHelper
@@ -17,23 +17,18 @@ describe "/opportunities/index" do
     assign(:opportunities, [ FactoryGirl.create(:opportunity, :id => 42) ].paginate)
 
     render :template => 'opportunities/index', :formats => [:js]
-    
-    rendered.should have_rjs("opportunities") do |rjs|
-      with_tag("li[id=opportunity_#{42}]")
-    end
-    rendered.should have_rjs("paginate")
+
+    rendered.should include("jQuery('#opportunities').html")
+    rendered.should include("#paginate")
   end
 
   it "should render [empty] template if @opportunities collection if there are no opportunities" do
     assign(:opportunities, [].paginate)
 
     render :template => 'opportunities/index', :formats => [:js]
-    
-    rendered.should have_rjs("opportunities") do |rjs|
-      with_tag("div[id=empty]")
-    end
-    rendered.should have_rjs("paginate")
+
+    rendered.should include("jQuery('#opportunities').html('<div id=\\'empty\\'>")
+    rendered.should include("#paginate")
   end
 
 end
-