fat_free_crm 0.12.3 → 0.13.0

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

@@ -15,35 +15,29 @@ describe "admin/users/edit" do
     params[:cancel] = "true"
     render
 
-    rendered.should have_rjs("user_#{@user.id}") do |rjs|
-      with_tag("li[id=user_#{@user.id}]")
-    end
+    rendered.should include("jQuery('#user_#{@user.id}').replaceWith")
   end
 
   it "edit hides previously open [Edit User] and replaces it with user partial" do
     assign(:previous, previous = FactoryGirl.create(:user))
     render
 
-    rendered.should have_rjs("user_#{previous.id}") do |rjs|
-      with_tag("li[id=user_#{previous.id}]")
-    end
+    rendered.should include("user_#{previous.id}")
   end
 
   it "edit removes previously open [Edit User] if it's no longer available" do
     assign(:previous, previous = 41)
     render
 
-    rendered.should include(%Q/crm.flick("user_#{previous}", "remove");/)
+    rendered.should include(%Q/crm.flick('user_#{previous}', 'remove');/)
   end
 
   it "edit turns off highlight, hides [Create User] form, and replaces current user with [Edit User] form" do
     render
 
-    rendered.should include(%Q/crm.highlight_off("user_#{@user.id}");/)
-    rendered.should include('crm.hide_form("create_user")')
-    rendered.should have_rjs("user_#{@user.id}") do |rjs|
-      with_tag("form[class=edit_user]")
-    end
+    rendered.should include(%Q/crm.highlight_off('user_#{@user.id}');/)
+    rendered.should include(%Q/crm.hide_form('create_user')/)
+    rendered.should include("user_#{@user.id}")
   end
 
 end

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

@@ -17,11 +17,9 @@ describe "admin/users/index" do
 
     render :template => 'admin/users/index', :formats => [:js]
     
-    rendered.should have_rjs("users") do |rjs|
-      with_tag("li[id=user_#{amy.id}]")
-      with_tag("li[id=user_#{bob.id}]")
-    end
-    rendered.should have_rjs("paginate")
+    rendered.should include("id=\\'user_#{amy.id}\\'")
+    rendered.should include("id=\\'user_#{bob.id}\\'")
+    rendered.should include("jQuery('#paginate')")
   end
 
 end

data/spec/views/admin/users/{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 "admin/users/new" do
   before do
@@ -16,9 +16,7 @@ describe "admin/users/new" do
       params[:cancel] = nil
       render
 
-      rendered.should have_rjs("create_user") do |rjs|
-        with_tag("form[class=new_user]")
-      end
+      rendered.should include("jQuery('#create_user').html")
     end
   end
 
@@ -27,8 +25,8 @@ describe "admin/users/new" do
       params[:cancel] = "true"
       render
 
-      rendered.should_not have_rjs("create_user")
-      rendered.should include('crm.flip_form("create_user");')
+      rendered.should include("crm.set_title('create_user', 'Users');")
+      rendered.should include("crm.flip_form('create_user');")
     end
   end
 

data/spec/views/admin/users/{reactivate.rjs_spec.rb → reactivate.js.haml_spec.rb}

@@ -14,9 +14,7 @@ describe "admin/users/reactivate" do
   it "reloads the requested user partial" do
     render
 
-    rendered.should have_rjs("user_#{@user.id}") do |rjs|
-      with_tag("li[id=user_#{@user.id}]")
-    end
-    rendered.should include(%Q/$("user_#{@user.id}").visualEffect("highlight"/)
+    rendered.should include("user_#{@user.id}")
+    rendered.should include(%Q/jQuery('#user_#{@user.id}').effect("highlight"/)
   end
 end

data/spec/views/admin/users/{suspend.rjs_spec.rb → suspend.js.haml_spec.rb}

@@ -14,9 +14,7 @@ describe "admin/users/suspend" do
   it "reloads the requested user partial" do
     render
 
-    rendered.should have_rjs("user_#{@user.id}") do |rjs|
-      with_tag("li[id=user_#{@user.id}]")
-    end
-    rendered.should include(%Q/$("user_#{@user.id}").visualEffect("highlight"/)
+    rendered.should include("user_#{@user.id}")
+    rendered.should include(%Q/jQuery('#user_#{@user.id}').effect("highlight"/)
   end
 end

data/spec/views/admin/users/{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 "admin/users/update" do
   before do
@@ -15,10 +15,8 @@ describe "admin/users/update" do
     it "replaces [Edit User] form with user partial and highlights it" do
       render
 
-      rendered.should have_rjs("user_#{@user.id}") do |rjs|
-        with_tag("li[id=user_#{@user.id}]")
-      end
-      rendered.should include(%Q/$("user_#{@user.id}").visualEffect("highlight"/)
+      rendered.should include("user_#{@user.id}")
+      rendered.should include(%Q/jQuery('#user_#{@user.id}').effect("highlight"/)
     end
   end # no errors
 
@@ -30,11 +28,9 @@ describe "admin/users/update" do
     it "redraws [Edit User] form and shakes it" do
       render
 
-      rendered.should have_rjs("user_#{@user.id}") do |rjs|
-        with_tag("form[class=edit_user]")
-      end
-      rendered.should include(%Q/$("user_#{@user.id}").visualEffect("shake"/)
-      rendered.should include('$("user_username").focus()')
+      rendered.should include("user_#{@user.id}")
+      rendered.should include(%Q/jQuery('#user_#{@user.id}').effect("shake"/)
+      rendered.should include(%Q/jQuery('#user_username').focus()/)
     end
   end # errors
 end

data/spec/views/campaigns/{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 "/campaigns/create" do
   before do
@@ -19,21 +19,18 @@ describe "/campaigns/create" do
     end
 
     it "should hide [Create Campaign] form and insert campaign partial" do
-      rendered.should have_rjs(:insert, :top) do |rjs|
-        with_tag("li[id=campaign_#{@campaign.id}]")
-      end
-      rendered.should include(%Q/$("campaign_#{@campaign.id}").visualEffect("highlight"/)
+      rendered.should include("jQuery('#campaigns').prepend('<li class=\\'campaign highlight\\' id=\\'campaign_#{@campaign.id}\\'")
+      rendered.should include(%Q/jQuery('#campaign_#{@campaign.id}').effect("highlight"/)
     end
 
     it "should update pagination" do
-      rendered.should have_rjs("paginate")
+      rendered.should include("#paginate")
     end
 
     it "should update Campaigns sidebar filters" do
-      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("Campaign Statuses")
+      rendered.should have_text("Recent Items")
     end
   end
 
@@ -44,10 +41,8 @@ describe "/campaigns/create" do
 
       render
 
-      rendered.should have_rjs("create_campaign") do |rjs|
-        with_tag("form[class=new_campaign]")
-      end
-      rendered.should include('$("create_campaign").visualEffect("shake"')
+      rendered.should include("jQuery('#create_campaign').html")
+      rendered.should include(%Q/jQuery('#create_campaign').effect("shake"/)
     end
   end
 

data/spec/views/campaigns/{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 "/campaigns/destroy" do
   before do
@@ -15,18 +15,17 @@ describe "/campaigns/destroy" do
   end
 
   it "should blind up destroyed campaign partial" do
-    rendered.should include(%Q/$("campaign_#{@campaign.id}").visualEffect("blind_up"/)
+    rendered.should include("slideUp")
   end
 
   it "should update Campaigns sidebar" do
-    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(%Q/jQuery('#filters').effect('shake'/)
   end
 
   it "should update pagination" do
-    rendered.should have_rjs("paginate")
+    rendered.should include("#paginate")
   end
 
 end

data/spec/views/campaigns/{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 "/campaigns/edit" do
   include CampaignsHelper
@@ -18,9 +18,7 @@ describe "/campaigns/edit" do
     params[:cancel] = "true"
 
     render
-    rendered.should have_rjs("campaign_#{@campaign.id}") do |rjs|
-      with_tag("li[id=campaign_#{@campaign.id}]")
-    end
+    rendered.should include("jQuery('#campaign_#{@campaign.id}').replaceWith('<li class=\\'campaign highlight\\' id=\\'campaign_#{@campaign.id}\\'")
   end
 
   it "cancel from campaign landing page: should hide [Edit Campaign] form" do
@@ -28,7 +26,7 @@ describe "/campaigns/edit" do
     params[:cancel] = "true"
 
     render
-    rendered.should include('crm.flip_form("edit_campaign"')
+    rendered.should include("crm.flip_form('edit_campaign'")
   end
 
   it "edit: should hide previously open [Edit Campaign] for and replace it with campaign partial" do
@@ -36,9 +34,7 @@ describe "/campaigns/edit" do
     assign(:previous, previous = FactoryGirl.create(:campaign, :user => current_user))
 
     render
-    rendered.should have_rjs("campaign_#{previous.id}") do |rjs|
-      with_tag("li[id=campaign_#{previous.id}]")
-    end
+    rendered.should include("jQuery('#campaign_#{previous.id}').replaceWith('<li class=\\'campaign highlight\\' id=\\'campaign_#{previous.id}\\'")
   end
 
   it "edit: should remove previously open [Edit Campaign] if it's no longer available" do
@@ -46,35 +42,31 @@ describe "/campaigns/edit" do
     assign(:previous, previous = 41)
 
     render
-    rendered.should include(%Q/crm.flick("campaign_#{previous}", "remove");/)
+    rendered.should include(%Q/crm.flick('campaign_#{previous}', 'remove');/)
   end
 
   it "edit from campaigns index page: should turn off highlight, hide [Create Campaign], and replace current campaign with [Edit Campaign] form" do
     params[:cancel] = nil
 
     render
-    rendered.should include(%Q/crm.highlight_off("campaign_#{@campaign.id}");/)
-    rendered.should include('crm.hide_form("create_campaign")')
-    rendered.should have_rjs("campaign_#{@campaign.id}") do |rjs|
-      with_tag("form[class=edit_campaign]")
-    end
+    rendered.should include(%Q/crm.highlight_off('campaign_#{@campaign.id}');/)
+    rendered.should include("crm.hide_form('create_campaign')")
+    rendered.should include("jQuery('#campaign_#{@campaign.id}').html")
   end
 
   it "edit from campaign landing page: should show [Edit Campaign] form" do
     params[:cancel] = "false"
 
     render
-    rendered.should have_rjs("edit_campaign") do |rjs|
-      with_tag("form[class=edit_campaign]")
-    end
-    rendered.should include('crm.flip_form("edit_campaign"')
+    rendered.should include("jQuery('#edit_campaign').html")
+    rendered.should include("crm.flip_form('edit_campaign')")
   end
 
   it "should call JavaScript to set up popup Calendar" do
     params[:cancel] = nil
 
     render
-    rendered.should include('$("campaign_name").focus()')
+    rendered.should include('focus()')
   end
 
 end

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

data/spec/views/campaigns/{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 "/campaigns/new" do
   include CampaignsHelper
@@ -17,7 +17,7 @@ describe "/campaigns/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 campaign" do
@@ -25,16 +25,14 @@ describe "/campaigns/new" do
       params[:cancel] = nil
       render
 
-      rendered.should have_rjs("create_campaign") do |rjs|
-        with_tag("form[class=new_campaign]")
-      end
+      rendered.should include("jQuery('#create_campaign').html")
     end
 
     it "should call JavaScript functions to load Calendar popup" do
       params[:cancel] = nil
       render
 
-      rendered.should include('crm.flip_form("create_campaign")')
+      rendered.should include("crm.flip_form('create_campaign')")
     end
   end
 
@@ -43,8 +41,8 @@ describe "/campaigns/new" do
       params[:cancel] = "true"
       render
 
-      rendered.should_not have_rjs("create_campaign")
-      rendered.should include('crm.flip_form("create_campaign")')
+      rendered.should_not include("#create_campaignx")
+      rendered.should include("crm.flip_form('create_campaign')")
     end
   end
 

data/spec/views/campaigns/{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 "/campaigns/update" do
   before do
@@ -22,17 +22,16 @@ describe "/campaigns/update" do
 
       it "should flip [edit_campaign] form" do
         render
-        rendered.should_not have_rjs("campaign_#{@campaign.id}")
-        rendered.should include('crm.flip_form("edit_campaign"')
+        rendered.should_not include("campaign_#{@campaign.id}")
+        rendered.should include("crm.flip_form('edit_campaign'")
       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("Campaign Summary")
+        rendered.should have_text("Recent Items")
+        rendered.should include("jQuery('#summary').effect('shake'")
       end
     end
 
@@ -41,12 +40,10 @@ describe "/campaigns/update" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/campaigns"
       end
 
-      it "should replace [Edit Campaign] with campaign partial and highligh it" do
+      it "should replace [Edit Campaign] with campaign partial and highlight it" do
         render
-        rendered.should have_rjs("campaign_#{@campaign.id}") do |rjs|
-          with_tag("li[id=campaign_#{@campaign.id}]")
-        end
-        rendered.should include(%Q/$("campaign_#{@campaign.id}").visualEffect("highlight"/)
+        rendered.should include("jQuery('#campaign_#{@campaign.id}').replaceWith('<li class=\\'campaign highlight\\' id=\\'campaign_#{@campaign.id}\\'")
+        rendered.should include(%Q/jQuery('#campaign_#{@campaign.id}').effect("highlight"/)
       end
     end
   end # no errors
@@ -60,10 +57,8 @@ describe "/campaigns/update" do
 
       it "should redraw the [edit_campaign] form and shake it" do
         render
-        rendered.should have_rjs("edit_campaign") do |rjs|
-          with_tag("form[class=edit_campaign]")
-        end
-        rendered.should include('$("edit_campaign").visualEffect("shake"')
+        rendered.should include("jQuery('#edit_campaign').html")
+        rendered.should include(%Q/jQuery('#edit_campaign').effect("shake"/)
         rendered.should include('focus()')
       end
     end
@@ -76,10 +71,8 @@ describe "/campaigns/update" do
 
       it "should redraw the [edit_campaign] form and shake it" do
         render
-        rendered.should have_rjs("campaign_#{@campaign.id}") do |rjs|
-          with_tag("form[class=edit_campaign]")
-        end
-        rendered.should include(%Q/$("campaign_#{@campaign.id}").visualEffect("shake"/)
+        rendered.should include("jQuery('#campaign_#{@campaign.id}').html")
+        rendered.should include(%Q/jQuery('#campaign_#{@campaign.id}').effect("shake"/)
         rendered.should include('focus()')
       end
     end