fat_free_crm 0.12.3 → 0.13.0

data/spec/views/opportunities/{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 "/opportunities/new" do
   include OpportunitiesHelper
@@ -21,7 +21,7 @@ describe "/opportunities/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 opportunity" do
@@ -29,16 +29,14 @@ describe "/opportunities/new" do
       params[:cancel] = nil
       render
 
-      rendered.should have_rjs("create_opportunity") do |rjs|
-        with_tag("form[class=new_opportunity]")
-      end
+      rendered.should include("#create_opportunity")
     end
 
     it "should call JavaScript functions to load Calendar popup" do
       params[:cancel] = nil
       render
 
-      rendered.should include('crm.flip_form("create_opportunity")')
+      rendered.should include("crm.flip_form('create_opportunity')")
     end
   end
 
@@ -47,8 +45,8 @@ describe "/opportunities/new" do
       params[:cancel] = "true"
       render
 
-      rendered.should_not have_rjs("create_opportunity")
-      rendered.should include('crm.flip_form("create_opportunity")')
+      rendered.should_not include("#create_opportunity")
+      rendered.should include("crm.flip_form('create_opportunity')")
     end
   end
 

data/spec/views/opportunities/{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 "/opportunities/update" do
   before do
@@ -25,17 +25,16 @@ describe "/opportunities/update" do
 
       it "should flip [edit_opportunity] form" do
         render
-        rendered.should_not have_rjs("opportunity_#{@opportunity.id}")
-        rendered.should include('crm.flip_form("edit_opportunity"')
+        rendered.should_not include("opportunity_#{@opportunity.id}")
+        rendered.should include("crm.flip_form('edit_opportunity'")
       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("Opportunity At a Glance")
+        rendered.should have_text("Recent Items")
+        rendered.should include("jQuery('#summary').effect('shake'")
       end
     end
 
@@ -44,21 +43,18 @@ describe "/opportunities/update" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/opportunities"
       end
 
-      it "should replace [Edit Opportunity] with opportunity partial and highligh it" do
+      it "should replace [Edit Opportunity] with opportunity partial and highlight it" do
         render
-        rendered.should have_rjs("opportunity_#{@opportunity.id}") do |rjs|
-          with_tag("li[id=opportunity_#{@opportunity.id}]")
-        end
-        rendered.should include(%Q/$("opportunity_#{@opportunity.id}").visualEffect("highlight"/)
+        rendered.should include("jQuery('#opportunity_#{@opportunity.id}').replaceWith")
+        rendered.should include(%Q/jQuery('#opportunity_#{@opportunity.id}').effect("highlight"/)
       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("Opportunity Stages")
+        rendered.should have_text("Recent Items")
+        rendered.should include("jQuery('#filters').effect('shake'")
       end
     end
 
@@ -68,10 +64,9 @@ describe "/opportunities/update" 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 campaign sidebar" do
@@ -79,29 +74,23 @@ describe "/opportunities/update" 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 for 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
 
-      it "should replace [Edit Opportunity] with opportunity partial and highligh it" do
+      it "should replace [Edit Opportunity] with opportunity partial and highlight it" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/contacts/123"
         render
 
-        rendered.should have_rjs("opportunity_#{@opportunity.id}") do |rjs|
-          with_tag("li[id=opportunity_#{@opportunity.id}]")
-        end
-        rendered.should include(%Q/$("opportunity_#{@opportunity.id}").visualEffect("highlight"/)
+        rendered.should include(%Q/jQuery('#opportunity_#{@opportunity.id}').effect("highlight"/)
       end
     end
   end
@@ -118,11 +107,9 @@ describe "/opportunities/update" do
 
       it "should redraw the [edit_opportunity] form and shake it" do
         render
-        rendered.should have_rjs("edit_opportunity") do |rjs|
-          with_tag("form[class=edit_opportunity]")
-        end
+        rendered.should include("jQuery('#edit_opportunity').html")
         rendered.should include('crm.create_or_select_account(false)')
-        rendered.should include('$("edit_opportunity").visualEffect("shake"')
+        rendered.should include(%Q/jQuery('#edit_opportunity').effect("shake"/)
         rendered.should include('focus()')
       end
     end
@@ -134,11 +121,9 @@ describe "/opportunities/update" do
 
       it "should redraw the [edit_opportunity] form and shake it" do
         render
-        rendered.should have_rjs("opportunity_#{@opportunity.id}") do |rjs|
-          with_tag("form[class=edit_opportunity]")
-        end
+        rendered.should include("jQuery('#opportunity_#{@opportunity.id}').html")
         rendered.should include('crm.create_or_select_account(false)')
-        rendered.should include(%Q/$("opportunity_#{@opportunity.id}").visualEffect("shake"/)
+        rendered.should include(%Q/jQuery('#opportunity_#{@opportunity.id}').effect("shake"/)
         rendered.should include('focus()')
       end
     end
@@ -155,10 +140,8 @@ describe "/opportunities/update" do
 
       it "should redraw the [edit_opportunity] form and shake it" do
         render
-        rendered.should have_rjs("opportunity_#{@opportunity.id}") do |rjs|
-          with_tag("form[class=edit_opportunity]")
-        end
-        rendered.should include(%Q/$("opportunity_#{@opportunity.id}").visualEffect("shake"/)
+        rendered.should include("jQuery('#opportunity_#{@opportunity.id}').html")
+        rendered.should include(%Q/jQuery('#opportunity_#{@opportunity.id}').effect("shake"/)
         rendered.should include('focus()')
       end
     end

data/spec/views/tasks/_edit.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 "/tasks/_edit" do
   include TasksHelper

data/spec/views/tasks/{complete.rjs_spec.rb → complete.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 "/tasks/complete" do
   include TasksHelper
@@ -26,8 +26,8 @@ describe "/tasks/complete" do
       controller.request.env["HTTP_REFERER"] = "http://localhost/tasks"
 
       render
-      rendered.should include(%Q/$("task_#{@task.id}").visualEffect("fade"/)
-      rendered.should include(%Q/$("list_due_asap").visualEffect("fade"/)
+      rendered.should include("jQuery('#task_#{@task.id}').fadeOut")
+      rendered.should include("jQuery('#list_due_asap').fadeOut")
     end
 
     it "should update tasks sidebar" do
@@ -37,11 +37,10 @@ describe "/tasks/complete" do
       controller.request.env["HTTP_REFERER"] = "http://localhost/tasks"
 
       render
-      rendered.should have_rjs("sidebar") do |rjs|
-        with_tag("div[id=filters]")
-        with_tag("div[id=recently]")
-      end
-      rendered.should include(%Q/$("filters").visualEffect("shake"/)
+      rendered.should include("jQuery('#sidebar').html")
+      rendered.should have_text("Assigned")
+      rendered.should have_text("Recent Items")
+      rendered.should include("jQuery('#filters').effect('shake'")
     end
   end
 
@@ -51,9 +50,7 @@ describe "/tasks/complete" do
       assign(:task, @task)
 
       render
-      rendered.should have_rjs("task_#{@task.id}") do |rjs|
-        with_tag("li[id=task_#{@task.id}]")
-      end
+      rendered.should include("jQuery('#task_#{@task.id}').html('<li class=\\'highlight task\\' id=\\'task_#{@task.id}\\'")
       rendered.should include('<strike>')
     end
 
@@ -63,9 +60,7 @@ describe "/tasks/complete" do
       controller.request.env["HTTP_REFERER"] = "http://localhost/leads/123"
 
       render
-      rendered.should have_rjs("recently") do |rjs|
-        with_tag("div[class=caption]")
-      end
+      rendered.should have_text("Recent Items")
     end
   end
 

data/spec/views/tasks/{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 "/tasks/create" do
   include TasksHelper
@@ -23,26 +23,23 @@ describe "/tasks/create" do
       end
 
       it "should hide [Create Task] form and insert task partial" do
-        rendered.should have_rjs(:insert, :top) do |rjs|
-          with_tag("li[id=task_#{@task.id}]")
-        end
-        rendered.should include(%Q/$("task_#{@task.id}").visualEffect("highlight"/)
+        rendered.should include(%Q/jQuery('#due_asap').before('<li class=\\'highlight task\\' id=\\'task_#{@task.id}\\'>/)
+        rendered.should include(%Q/jQuery('#task_#{@task.id}').effect("highlight"/)
       end
 
       it "should update tasks title" do
         if status == "assigned"
-          rendered.should include('$("title").update("Assigned Tasks")')
+          rendered.should include("jQuery('#title').html('Assigned Tasks');")
         else
-          rendered.should include('$("title").update("Tasks")')
+          rendered.should include("jQuery('#title').html('Tasks');")
         end
       end
 
       it "should update tasks sidebar" do
-        rendered.should have_rjs("sidebar") do |rjs|
-          with_tag("div[id=filters]")
-          with_tag("div[id=recently]")
-        end
-        rendered.should include(%Q/$("filters").visualEffect("shake"/)
+        rendered.should include("jQuery('#sidebar').html")
+        rendered.should have_text("Recent Items")
+        rendered.should have_text("Sometime Later")
+        rendered.should include("jQuery('#filters').effect('shake'")
       end
     end
   end
@@ -53,8 +50,8 @@ describe "/tasks/create" do
     controller.request.env["HTTP_REFERER"] = "http://localhost/tasks"
     render
 
-    rendered.should include('$("flash").update(')
-    rendered.should include('crm.flash("notice", true)')
+    rendered.should include("jQuery('#flash').html")
+    rendered.should include("crm.flash('notice', true)")
   end
 
   it "should update recent items when assigning a task from pending tasks view" do
@@ -63,9 +60,8 @@ describe "/tasks/create" do
     controller.request.env["HTTP_REFERER"] = "http://localhost/tasks"
     render
 
-    rendered.should have_rjs("recently") do |rjs|
-      with_tag("div[class=caption]", :text => "Recent Items")
-    end
+    rendered.should include("#recently")
+    rendered.should have_text("Recent Items")
   end
 
   it "should show flash message when creating a pending task from assigned tasks view" do
@@ -74,8 +70,8 @@ describe "/tasks/create" do
     controller.request.env["HTTP_REFERER"] = "http://localhost/tasks?view=assigned"
     render
 
-    rendered.should include('$("flash").update(')
-    rendered.should include('crm.flash("notice", true)')
+    rendered.should include("jQuery('#flash').html")
+    rendered.should include("crm.flash('notice', true)")
   end
 
   it "should update recent items when creating a pending task from assigned tasks view" do
@@ -84,9 +80,8 @@ describe "/tasks/create" do
     controller.request.env["HTTP_REFERER"] = "http://localhost/tasks?view=assigned"
     render
 
-    rendered.should have_rjs("recently") do |rjs|
-      with_tag("div[class=caption]", :text => "Recent Items")
-    end
+    rendered.should include("#recently")
+    rendered.should have_text("Recent Items")
   end
 
   (TASK_STATUSES - %w(assigned)).each do |status|
@@ -99,20 +94,17 @@ describe "/tasks/create" do
       end
 
       it "should update tasks title" do
-        rendered.should include('$("create_task_title").update("Tasks")')
+        rendered.should include("jQuery('#create_task_title').html('Tasks')")
       end
 
       it "should insert #{status} partial and highlight it" do
-        rendered.should have_rjs(:insert, :top) do |rjs|
-          with_tag("li[id=task_#{@task.id}]")
-        end
-        rendered.should include(%Q/$("task_#{@task.id}").visualEffect("highlight"/)
+        rendered.should include("jQuery('#tasks').prepend('<li class=\\'highlight task\\' id=\\'task_#{@task.id}\\'>")
+        rendered.should include(%Q/jQuery('#task_#{@task.id}').effect("highlight"/)
       end
 
       it "should update recently viewed items" do
-        rendered.should have_rjs("recently") do |rjs|
-          with_tag("div[class=caption]", :text => "Recent Items")
-        end
+        rendered.should include("#recently")
+        rendered.should have_text("Recent Items")
       end
     end
   end
@@ -121,9 +113,9 @@ describe "/tasks/create" do
     assign(:task, FactoryGirl.build(:task, :name => nil)) # make it invalid
     render
 
-    rendered.should include('$("create_task").visualEffect("shake"')
-    rendered.should include(%/$$('#new_task input[type=submit]').invoke('enable')/)
-    
+    rendered.should include(%Q/jQuery('#create_task').effect("shake"/)
+    rendered.should include(%/jQuery('#new_task input[type=submit]').enable()/)
+
   end
 
 end

data/spec/views/tasks/{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 "/tasks/destroy" do
   include TasksHelper
@@ -26,19 +26,18 @@ describe "/tasks/destroy" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/tasks"
 
         render
-        rendered.should include(%Q/$("task_#{@task.id}").visualEffect("blind_up"/)
-        rendered.should include(%Q/$("list_due_asap").visualEffect("fade"/)
+        rendered.should include("slideUp")
+        rendered.should include("jQuery('#list_due_asap').fadeOut")
       end
 
       it "should update tasks sidebar" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/tasks"
 
         render
-        rendered.should have_rjs("sidebar") do |rjs|
-          with_tag("div[id=filters]")
-          with_tag("div[id=recently]")
-        end
-        rendered.should include(%Q/$("filters").visualEffect("shake"/)
+        rendered.should include("jQuery('#sidebar').html")
+        rendered.should have_text("Recent Items")
+        rendered.should have_text("Completed")
+        rendered.should include("jQuery('#filters').effect('shake'")
       end
     end
   end
@@ -50,9 +49,8 @@ describe "/tasks/destroy" do
       controller.request.env["HTTP_REFERER"] = "http://localhost/leads/123"
 
       render
-      rendered.should include(%Q/$("task_#{@task.id}").visualEffect("blind_up"/)
-      rendered.should_not include(%Q/$("list_due_asap").visualEffect("fade"/) # bucket is not empty
+      rendered.should include("slideUp")
+      rendered.should_not include("fadeOut") # bucket is not empty
     end
   end
 end
-

data/spec/views/tasks/{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 "/tasks/edit" do
   include TasksHelper
@@ -24,9 +24,7 @@ describe "/tasks/edit" do
       assign(:task, @task)
 
       render
-      rendered.should have_rjs("task_#{@task.id}") do |rjs|
-        with_tag("li[id=task_#{@task.id}]")
-      end
+      rendered.should include("jQuery('#task_#{@task.id}').html('<li class=\\'highlight task\\' id=\\'task_#{@task.id}\\'")
       if view == "pending"
         rendered.should include('type=\\"checkbox\\"')
       else
@@ -39,7 +37,7 @@ describe "/tasks/edit" do
       assign(:task, stub_task(view))
 
       render
-      rendered.should include('crm.hide_form("create_task"')
+      rendered.should include("crm.hide_form('create_task'")
     end
 
     it "edit: should hide previously open [Edit Task] form" do
@@ -49,9 +47,7 @@ describe "/tasks/edit" do
       assign(:task, stub_task(view))
 
       render
-      rendered.should have_rjs("task_#{@previous.id}") do |rjs|
-        with_tag("li[id=task_#{@previous.id}]")
-      end
+      rendered.should include("jQuery('#task_#{@previous.id}').replaceWith")
     end
 
     it "edit: should remove previous [Edit Task] form if previous task is not available" do
@@ -61,7 +57,7 @@ describe "/tasks/edit" do
       assign(:task, stub_task(view))
 
       render
-      rendered.should include(%Q/crm.flick("task_41", "remove");/)
+      rendered.should include("crm.flick('task_41', 'remove');")
     end
 
     it "edit: should turn off highlight and replace current task with [Edit Task] form" do
@@ -70,11 +66,10 @@ describe "/tasks/edit" do
       assign(:task, @task)
 
       render
-      rendered.should include(%Q/crm.highlight_off("task_#{@task.id}");/)
-      rendered.should have_rjs("task_#{@task.id}") do |rjs|
-        with_tag("form[class=edit_task]")
-      end
-      rendered.should include('$("task_name").focus()')
+      rendered.should include("crm.highlight_off('task_#{@task.id}');")
+      rendered.should include("jQuery('#task_#{@task.id}').html")
+      rendered.should have_text("On Specific Date")
+      rendered.should include("jQuery('#task_name').focus();")
     end
 
   end