fat_free_crm 0.13.2 → 0.13.3

data/spec/views/opportunities/create.js.haml_spec.rb

@@ -21,8 +21,8 @@ describe "/opportunities/create" do
     it "should hide [Create Opportunity] form and insert opportunity partial" do
       render
 
-      rendered.should include("jQuery('#opportunities').prepend('<li class=\\'highlight opportunity\\' id=\\'opportunity_#{@opportunity.id}\\'")
-      rendered.should include(%Q/jQuery('#opportunity_#{@opportunity.id}').effect("highlight"/)
+      rendered.should include("$('#opportunities').prepend('<li class=\\'highlight opportunity\\' id=\\'opportunity_#{@opportunity.id}\\'")
+      rendered.should include(%Q/$('#opportunity_#{@opportunity.id}').effect("highlight"/)
     end
 
     it "should update sidebar filters and recently viewed items when called from opportunities page" do
@@ -78,8 +78,8 @@ describe "/opportunities/create" do
 
       render
 
-      rendered.should include("jQuery('#create_opportunity').html")
-      rendered.should include(%Q/jQuery('#create_opportunity').effect("shake"/)
+      rendered.should include("$('#create_opportunity').html")
+      rendered.should include(%Q/$('#create_opportunity').effect("shake"/)
       rendered.should include("crm.create_or_select_account(false)")
     end
   end

data/spec/views/opportunities/destroy.js.haml_spec.rb

@@ -25,7 +25,7 @@ describe "/opportunities/destroy" do
 
     rendered.should include("#sidebar")
     rendered.should have_text("Recent Items")
-    rendered.should include("jQuery('#filters').effect('shake'")
+    rendered.should include("$('#filters').effect('shake'")
   end
 
   it "should update pagination when called from opportunities index" do

data/spec/views/opportunities/edit.js.haml_spec.rb

@@ -22,7 +22,7 @@ describe "/opportunities/edit" do
     params[:cancel] = "true"
 
     render
-    rendered.should include("jQuery('#opportunity_#{@opportunity.id}').replaceWith")
+    rendered.should include("$('#opportunity_#{@opportunity.id}').replaceWith")
   end
 
   it "cancel from opportunity landing page: should hide [Edit Opportunity] form" do
@@ -38,7 +38,7 @@ describe "/opportunities/edit" do
     assign(:previous, previous = FactoryGirl.create(:opportunity, :user => current_user))
 
     render
-    rendered.should include("jQuery('#opportunity_#{previous.id}').replaceWith")
+    rendered.should include("$('#opportunity_#{previous.id}').replaceWith")
   end
 
   it "edit: remove previously open [Edit Opportunity] if it's no longer available" do
@@ -55,14 +55,14 @@ describe "/opportunities/edit" do
     render
     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")
+    rendered.should include("$('#opportunity_#{@opportunity.id}').html")
   end
 
   it "edit from opportunity landing page: should show [Edit Opportunity] form" do
     params[:cancel] = "false"
 
     render
-    rendered.should include("jQuery('#edit_opportunity').html")
+    rendered.should include("$('#edit_opportunity').html")
     rendered.should include("crm.flip_form('edit_opportunity'")
   end
 

data/spec/views/opportunities/index.js.haml_spec.rb

@@ -18,7 +18,7 @@ describe "/opportunities/index" do
 
     render :template => 'opportunities/index', :formats => [:js]
 
-    rendered.should include("jQuery('#opportunities').html")
+    rendered.should include("$('#opportunities').html")
     rendered.should include("#paginate")
   end
 
@@ -27,7 +27,7 @@ describe "/opportunities/index" do
 
     render :template => 'opportunities/index', :formats => [:js]
 
-    rendered.should include("jQuery('#opportunities').html('<div id=\\'empty\\'>")
+    rendered.should include("$('#opportunities').html('<div id=\\'empty\\'>")
     rendered.should include("#paginate")
   end
 

data/spec/views/opportunities/update.js.haml_spec.rb

@@ -34,7 +34,7 @@ describe "/opportunities/update" do
         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'")
+        rendered.should include("$('#summary').effect('shake'")
       end
     end
 
@@ -45,8 +45,8 @@ describe "/opportunities/update" do
 
       it "should replace [Edit Opportunity] with opportunity partial and highlight it" do
         render
-        rendered.should include("jQuery('#opportunity_#{@opportunity.id}').replaceWith")
-        rendered.should include(%Q/jQuery('#opportunity_#{@opportunity.id}').effect("highlight"/)
+        rendered.should include("$('#opportunity_#{@opportunity.id}').replaceWith")
+        rendered.should include(%Q/$('#opportunity_#{@opportunity.id}').effect("highlight"/)
       end
 
       it "should update sidebar" do
@@ -54,7 +54,7 @@ describe "/opportunities/update" do
         rendered.should include("sidebar")
         rendered.should have_text("Opportunity Stages")
         rendered.should have_text("Recent Items")
-        rendered.should include("jQuery('#filters').effect('shake'")
+        rendered.should include("$('#filters').effect('shake'")
       end
     end
 
@@ -90,7 +90,7 @@ describe "/opportunities/update" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/contacts/123"
         render
 
-        rendered.should include(%Q/jQuery('#opportunity_#{@opportunity.id}').effect("highlight"/)
+        rendered.should include(%Q/$('#opportunity_#{@opportunity.id}').effect("highlight"/)
       end
     end
   end
@@ -107,9 +107,9 @@ describe "/opportunities/update" do
 
       it "should redraw the [edit_opportunity] form and shake it" do
         render
-        rendered.should include("jQuery('#edit_opportunity').html")
+        rendered.should include("$('#edit_opportunity').html")
         rendered.should include('crm.create_or_select_account(false)')
-        rendered.should include(%Q/jQuery('#edit_opportunity').effect("shake"/)
+        rendered.should include(%Q/$('#edit_opportunity').effect("shake"/)
         rendered.should include('focus()')
       end
     end
@@ -121,9 +121,9 @@ describe "/opportunities/update" do
 
       it "should redraw the [edit_opportunity] form and shake it" do
         render
-        rendered.should include("jQuery('#opportunity_#{@opportunity.id}').html")
+        rendered.should include("$('#opportunity_#{@opportunity.id}').html")
         rendered.should include('crm.create_or_select_account(false)')
-        rendered.should include(%Q/jQuery('#opportunity_#{@opportunity.id}').effect("shake"/)
+        rendered.should include(%Q/$('#opportunity_#{@opportunity.id}').effect("shake"/)
         rendered.should include('focus()')
       end
     end
@@ -140,8 +140,8 @@ describe "/opportunities/update" do
 
       it "should redraw the [edit_opportunity] form and shake it" do
         render
-        rendered.should include("jQuery('#opportunity_#{@opportunity.id}').html")
-        rendered.should include(%Q/jQuery('#opportunity_#{@opportunity.id}').effect("shake"/)
+        rendered.should include("$('#opportunity_#{@opportunity.id}').html")
+        rendered.should include(%Q/$('#opportunity_#{@opportunity.id}').effect("shake"/)
         rendered.should include('focus()')
       end
     end

data/spec/views/tasks/complete.js.haml_spec.rb

@@ -26,8 +26,8 @@ describe "/tasks/complete" do
       controller.request.env["HTTP_REFERER"] = "http://localhost/tasks"
 
       render
-      rendered.should include("jQuery('#task_#{@task.id}').fadeOut")
-      rendered.should include("jQuery('#list_due_asap').fadeOut")
+      rendered.should include("$('#task_#{@task.id}').fadeOut")
+      rendered.should include("$('#list_due_asap').fadeOut")
     end
 
     it "should update tasks sidebar" do
@@ -37,10 +37,10 @@ describe "/tasks/complete" do
       controller.request.env["HTTP_REFERER"] = "http://localhost/tasks"
 
       render
-      rendered.should include("jQuery('#sidebar').html")
+      rendered.should include("$('#sidebar').html")
       rendered.should have_text("Assigned")
       rendered.should have_text("Recent Items")
-      rendered.should include("jQuery('#filters').effect('shake'")
+      rendered.should include("$('#filters').effect('shake'")
     end
   end
 
@@ -50,7 +50,7 @@ describe "/tasks/complete" do
       assign(:task, @task)
 
       render
-      rendered.should include("jQuery('#task_#{@task.id}').html('<li class=\\'highlight task\\' id=\\'task_#{@task.id}\\'")
+      rendered.should include("$('#task_#{@task.id}').html('<li class=\\'highlight task\\' id=\\'task_#{@task.id}\\'")
       rendered.should include('<strike>')
     end
 

data/spec/views/tasks/create.js.haml_spec.rb

@@ -23,23 +23,23 @@ describe "/tasks/create" do
       end
 
       it "should hide [Create Task] form and insert task partial" do
-        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"/)
+        rendered.should include(%Q/$('#due_asap').before('<li class=\\'highlight task\\' id=\\'task_#{@task.id}\\'>/)
+        rendered.should include(%Q/$('#task_#{@task.id}').effect("highlight"/)
       end
 
       it "should update tasks title" do
         if status == "assigned"
-          rendered.should include("jQuery('#title').html('Assigned Tasks');")
+          rendered.should include("$('#title').html('Assigned Tasks');")
         else
-          rendered.should include("jQuery('#title').html('Tasks');")
+          rendered.should include("$('#title').html('Tasks');")
         end
       end
 
       it "should update tasks sidebar" do
-        rendered.should include("jQuery('#sidebar').html")
+        rendered.should include("$('#sidebar').html")
         rendered.should have_text("Recent Items")
         rendered.should have_text("Sometime Later")
-        rendered.should include("jQuery('#filters').effect('shake'")
+        rendered.should include("$('#filters').effect('shake'")
       end
     end
   end
@@ -50,7 +50,7 @@ describe "/tasks/create" do
     controller.request.env["HTTP_REFERER"] = "http://localhost/tasks"
     render
 
-    rendered.should include("jQuery('#flash').html")
+    rendered.should include("$('#flash').html")
     rendered.should include("crm.flash('notice', true)")
   end
 
@@ -70,7 +70,7 @@ describe "/tasks/create" do
     controller.request.env["HTTP_REFERER"] = "http://localhost/tasks?view=assigned"
     render
 
-    rendered.should include("jQuery('#flash').html")
+    rendered.should include("$('#flash').html")
     rendered.should include("crm.flash('notice', true)")
   end
 
@@ -94,12 +94,12 @@ describe "/tasks/create" do
       end
 
       it "should update tasks title" do
-        rendered.should include("jQuery('#create_task_title').html('Tasks')")
+        rendered.should include("$('#create_task_title').html('Tasks')")
       end
 
       it "should insert #{status} partial and highlight it" do
-        rendered.should include("jQuery('#tasks').prepend('<li class=\\'highlight task\\' id=\\'task_#{@task.id}\\'>")
-        rendered.should include(%Q/jQuery('#task_#{@task.id}').effect("highlight"/)
+        rendered.should include("$('#tasks').prepend('<li class=\\'highlight task\\' id=\\'task_#{@task.id}\\'>")
+        rendered.should include(%Q/$('#task_#{@task.id}').effect("highlight"/)
       end
 
       it "should update recently viewed items" do
@@ -113,8 +113,8 @@ describe "/tasks/create" do
     assign(:task, FactoryGirl.build(:task, :name => nil)) # make it invalid
     render
 
-    rendered.should include(%Q/jQuery('#create_task').effect("shake"/)
-    rendered.should include(%/jQuery('#new_task input[type=submit]').enable()/)
+    rendered.should include(%Q/$('#create_task').effect("shake"/)
+    rendered.should include(%/$('#new_task input[type=submit]').enable()/)
 
   end
 

data/spec/views/tasks/destroy.js.haml_spec.rb

@@ -27,17 +27,17 @@ describe "/tasks/destroy" do
 
         render
         rendered.should include("slideUp")
-        rendered.should include("jQuery('#list_due_asap').fadeOut")
+        rendered.should include("$('#list_due_asap').fadeOut")
       end
 
       it "should update tasks sidebar" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/tasks"
 
         render
-        rendered.should include("jQuery('#sidebar').html")
+        rendered.should include("$('#sidebar').html")
         rendered.should have_text("Recent Items")
         rendered.should have_text("Completed")
-        rendered.should include("jQuery('#filters').effect('shake'")
+        rendered.should include("$('#filters').effect('shake'")
       end
     end
   end

data/spec/views/tasks/edit.js.haml_spec.rb

@@ -24,7 +24,7 @@ describe "/tasks/edit" do
       assign(:task, @task)
 
       render
-      rendered.should include("jQuery('#task_#{@task.id}').html('<li class=\\'highlight task\\' id=\\'task_#{@task.id}\\'")
+      rendered.should include("$('#task_#{@task.id}').html('<li class=\\'highlight task\\' id=\\'task_#{@task.id}\\'")
       if view == "pending"
         rendered.should include('type=\\"checkbox\\"')
       else
@@ -47,7 +47,7 @@ describe "/tasks/edit" do
       assign(:task, stub_task(view))
 
       render
-      rendered.should include("jQuery('#task_#{@previous.id}').replaceWith")
+      rendered.should include("$('#task_#{@previous.id}').replaceWith")
     end
 
     it "edit: should remove previous [Edit Task] form if previous task is not available" do
@@ -67,9 +67,9 @@ describe "/tasks/edit" do
 
       render
       rendered.should include("crm.highlight_off('task_#{@task.id}');")
-      rendered.should include("jQuery('#task_#{@task.id}').html")
+      rendered.should include("$('#task_#{@task.id}').html")
       rendered.should have_text("On Specific Date")
-      rendered.should include("jQuery('#task_name').focus();")
+      rendered.should include("$('#task_name').focus();")
     end
 
   end

data/spec/views/tasks/new.js.haml_spec.rb

@@ -30,7 +30,7 @@ describe "/tasks/new" do
       params[:cancel] = nil
       render
 
-      rendered.should include("jQuery('#create_task').html")
+      rendered.should include("$('#create_task').html")
       rendered.should include("crm.flip_form('create_task');")
     end
   end
@@ -40,7 +40,7 @@ describe "/tasks/new" do
       params[:cancel] = "true"
       render
 
-      rendered.should_not include("jQuery('#create_task').html")
+      rendered.should_not include("$('#create_task').html")
       rendered.should include("crm.flip_form('create_task');")
     end
   end

data/spec/views/tasks/uncomplete.js.haml_spec.rb

@@ -0,0 +1,44 @@
+# Copyright (c) 2008-2013 Michael Dvorkin and contributors.
+#
+# 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 'spec_helper'
+
+describe "/tasks/uncomplete" do
+  include TasksHelper
+
+  before do
+    login_and_assign
+    assign(:bucket, [])
+  end
+
+  describe "uncomplete from Tasks tab (completed view)" do
+    before do
+      @task = FactoryGirl.create(:task)
+      assign(:task, @task)
+      assign(:view, "completed")
+      assign(:empty_bucket, :due_asap)
+      assign(:task_total, stub_task_total("completed"))
+    end
+
+    it "should slide up uncompleted task partial" do
+      controller.request.env["HTTP_REFERER"] = "http://localhost/tasks"
+
+      render
+      rendered.should include("$('#task_#{@task.id}').slideUp")
+      rendered.should include("$('#list_due_asap').fadeOut")
+    end
+
+    it "should update tasks sidebar" do
+      assign(:task, FactoryGirl.create(:task))
+      controller.request.env["HTTP_REFERER"] = "http://localhost/tasks"
+
+      render
+      rendered.should include("$('#sidebar').html")
+      rendered.should have_text("Assigned")
+      rendered.should have_text("Recent Items")
+      rendered.should include("$('#filters').effect('shake'")
+    end
+  end
+end

data/spec/views/tasks/update.js.haml_spec.rb

@@ -24,30 +24,30 @@ describe "/tasks/update" do
       controller.request.env["HTTP_REFERER"] = "http://localhost/tasks"
       render
 
-      rendered.should include(%Q/jQuery('#task_#{@task.id}').remove();/)
-      rendered.should include(%Q/jQuery('#list_due_asap').fadeOut/)
+      rendered.should include(%Q/$('#task_#{@task.id}').remove();/)
+      rendered.should include(%Q/$('#list_due_asap').fadeOut/)
     end
 
     it "from Tasks tab: should show updated task in a new bucket" do
       controller.request.env["HTTP_REFERER"] = "http://localhost/tasks"
       render
-      rendered.should include("jQuery('#due_tomorrow').prepend('<li class=\\'highlight task\\' id=\\'task_#{@task.id}\\'")
-      rendered.should include("jQuery('#task_#{@task.id}').effect('highlight'")
+      rendered.should include("$('#due_tomorrow').prepend('<li class=\\'highlight task\\' id=\\'task_#{@task.id}\\'")
+      rendered.should include("$('#task_#{@task.id}').effect('highlight'")
     end
 
     it "from Tasks tab: should update tasks sidebar" do
       controller.request.env["HTTP_REFERER"] = "http://localhost/tasks"
       render
 
-      rendered.should include("jQuery('#due_tomorrow').prepend('<li class=\\'highlight task\\' id=\\'task_#{@task.id}\\'")
+      rendered.should include("$('#due_tomorrow').prepend('<li class=\\'highlight task\\' id=\\'task_#{@task.id}\\'")
       rendered.should have_text("Assigned")
       rendered.should have_text("Recent Items")
-      rendered.should include("jQuery('#filters').effect('shake'")
+      rendered.should include("$('#filters').effect('shake'")
     end
 
     it "from asset page: should update task partial in place" do
       render
-      rendered.should include("jQuery('#task_#{@task.id}').html('<li class=\\'highlight task\\' id=\\'task_#{@task.id}\\'")
+      rendered.should include("$('#task_#{@task.id}').html('<li class=\\'highlight task\\' id=\\'task_#{@task.id}\\'")
     end
 
     it "from asset page: should update recently viewed items" do
@@ -70,9 +70,9 @@ describe "/tasks/update" do
       controller.request.env["HTTP_REFERER"] = "http://localhost/tasks"
 
       render
-      rendered.should include("jQuery('#task_#{@task.id}').remove();")
+      rendered.should include("$('#task_#{@task.id}').remove();")
       rendered.should have_text("view assigned tasks")
-      rendered.should include("jQuery('#flash').html")
+      rendered.should include("$('#flash').html")
       rendered.should include("crm.flash('notice', true)")
     end
 
@@ -84,9 +84,9 @@ describe "/tasks/update" do
       controller.request.env["HTTP_REFERER"] = "http://localhost/tasks?view=assigned"
 
       render
-      rendered.should include("jQuery('#task_#{@task.id}').remove();")
+      rendered.should include("$('#task_#{@task.id}').remove();")
       rendered.should have_text("view pending tasks")
-      rendered.should include("jQuery('#flash').html")
+      rendered.should include("$('#flash').html")
       rendered.should include("crm.flash('notice', true)")
     end
 
@@ -97,7 +97,7 @@ describe "/tasks/update" do
       controller.request.env["HTTP_REFERER"] = "http://localhost/tasks?view=assigned"
 
       render
-      rendered.should include("jQuery('#task_#{@task.id}').html('<li class=\\'highlight task\\' id=\\'task_#{@task.id}\\'")
+      rendered.should include("$('#task_#{@task.id}').html('<li class=\\'highlight task\\' id=\\'task_#{@task.id}\\'")
     end
 
     it "from Tasks tab: should update tasks sidebar" do
@@ -107,10 +107,10 @@ describe "/tasks/update" do
       controller.request.env["HTTP_REFERER"] = "http://localhost/tasks?view=assigned"
       render
 
-      rendered.should include("jQuery('#sidebar').html")
+      rendered.should include("$('#sidebar').html")
       rendered.should have_text("Recent Items")
       rendered.should have_text("Assigned")
-      rendered.should include("jQuery('#filters').effect('shake'")
+      rendered.should include("$('#filters').effect('shake'")
     end
 
     it "from asset page: should should re-render task partial" do
@@ -118,7 +118,7 @@ describe "/tasks/update" do
       assign(:task, @task       = FactoryGirl.create(:task, :assignee => FactoryGirl.create(:user)))
       render
 
-      rendered.should include("jQuery('#task_#{@task.id}').html('<li class=\\'highlight task\\' id=\\'task_#{@task.id}\\'")
+      rendered.should include("$('#task_#{@task.id}').html('<li class=\\'highlight task\\' id=\\'task_#{@task.id}\\'")
     end
 
     it "from asset page: should update recently viewed items" do
@@ -137,8 +137,8 @@ describe "/tasks/update" do
     @task.errors.add(:name)
 
     render
-    rendered.should include(%/jQuery('#task_#{@task.id}').effect("shake"/)
-    rendered.should include("jQuery('#task_submit').enable()")
+    rendered.should include(%/$('#task_#{@task.id}').effect("shake"/)
+    rendered.should include("$('#task_submit').enable()")
   end
 
 end