fat_free_crm 0.12.3 → 0.13.0

data/spec/views/tasks/index.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/index" do
   include TasksHelper
@@ -42,4 +42,3 @@ describe "/tasks/index" do
     end
   end
 end
-

data/spec/views/tasks/{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 "/tasks/new" do
   include TasksHelper
@@ -19,7 +19,7 @@ describe "/tasks/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 task" do
@@ -30,10 +30,8 @@ describe "/tasks/new" do
       params[:cancel] = nil
       render
 
-      rendered.should have_rjs("create_task") do |rjs|
-        with_tag("form[class=new_task]")
-      end
-      rendered.should include('crm.flip_form("create_task");')
+      rendered.should include("jQuery('#create_task').html")
+      rendered.should include("crm.flip_form('create_task');")
     end
   end
 
@@ -42,8 +40,8 @@ describe "/tasks/new" do
       params[:cancel] = "true"
       render
 
-      rendered.should_not have_rjs("create_task")
-      rendered.should include('crm.flip_form("create_task");')
+      rendered.should_not include("jQuery('#create_task').html")
+      rendered.should include("crm.flip_form('create_task');")
     end
   end
 

data/spec/views/tasks/{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 "/tasks/update" do
   include TasksHelper
@@ -24,42 +24,35 @@ describe "/tasks/update" do
       controller.request.env["HTTP_REFERER"] = "http://localhost/tasks"
       render
 
-      rendered.should include(%Q/$("task_#{@task.id}").replace("")/)
-      rendered.should include(%Q/$("list_due_asap").visualEffect("fade"/)
+      rendered.should include(%Q/jQuery('#task_#{@task.id}').remove();/)
+      rendered.should include(%Q/jQuery('#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 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('#due_tomorrow').prepend('<li class=\\'highlight task\\' id=\\'task_#{@task.id}\\'")
+      rendered.should include("jQuery('#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 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('#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'")
     end
 
     it "from asset page: should update task partial in place" do
       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}\\'")
     end
 
     it "from asset page: should update recently viewed items" do
       render
-      rendered.should have_rjs("recently") do |rjs|
-        with_tag("div[class=caption]")
-      end
+      rendered.should have_text("Recent Items")
     end
 
   end
@@ -77,9 +70,10 @@ describe "/tasks/update" do
       controller.request.env["HTTP_REFERER"] = "http://localhost/tasks"
 
       render
-      rendered.should include(%Q/$("task_#{@task.id}").replace("")/)
-      rendered.should include('("flash").update(')
-      rendered.should include('crm.flash("notice", true)')
+      rendered.should include("jQuery('#task_#{@task.id}').remove();")
+      rendered.should have_text("view assigned tasks")
+      rendered.should include("jQuery('#flash').html")
+      rendered.should include("crm.flash('notice', true)")
     end
 
     it "assigned tasks to me from Tasks tab: should remove the task and show flash message (pending)" do
@@ -90,9 +84,10 @@ describe "/tasks/update" do
       controller.request.env["HTTP_REFERER"] = "http://localhost/tasks?view=assigned"
 
       render
-      rendered.should include(%Q/$("task_#{@task.id}").replace("")/)
-      rendered.should include('("flash").update(')
-      rendered.should include('crm.flash("notice", true)')
+      rendered.should include("jQuery('#task_#{@task.id}').remove();")
+      rendered.should have_text("view pending tasks")
+      rendered.should include("jQuery('#flash').html")
+      rendered.should include("crm.flash('notice', true)")
     end
 
     it "assigned tasks to somebody else from Tasks tab: should re-render task partial" do
@@ -102,9 +97,7 @@ describe "/tasks/update" do
       controller.request.env["HTTP_REFERER"] = "http://localhost/tasks?view=assigned"
 
       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}\\'")
     end
 
     it "from Tasks tab: should update tasks sidebar" do
@@ -114,11 +107,10 @@ describe "/tasks/update" do
       controller.request.env["HTTP_REFERER"] = "http://localhost/tasks?view=assigned"
       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("Assigned")
+      rendered.should include("jQuery('#filters').effect('shake'")
     end
 
     it "from asset page: should should re-render task partial" do
@@ -126,9 +118,7 @@ describe "/tasks/update" do
       assign(:task, @task       = FactoryGirl.create(:task, :assignee => FactoryGirl.create(:user)))
       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}\\'")
     end
 
     it "from asset page: should update recently viewed items" do
@@ -136,9 +126,7 @@ describe "/tasks/update" do
       assign(:task, @task       = FactoryGirl.create(:task, :assignee => FactoryGirl.create(:user)))
       render
 
-      rendered.should have_rjs("recently") do |rjs|
-        with_tag("div[class=caption]")
-      end
+      rendered.should have_text("Recent Items")
     end
 
   end
@@ -149,9 +137,8 @@ describe "/tasks/update" do
     @task.errors.add(:name)
 
     render
-    rendered.should include(%/$("task_#{@task.id}").visualEffect("shake"/)
-    rendered.should include(%/$("task_submit").enable()/)
+    rendered.should include(%/jQuery('#task_#{@task.id}').effect("shake"/)
+    rendered.should include("jQuery('#task_submit').enable()")
   end
 
 end
-

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

@@ -17,20 +17,18 @@ describe "/users/avatar" do
     params[:cancel] = "true"
 
     render
-    rendered.should include('crm.flip_form("upload_avatar")')
-    rendered.should include('crm.set_title("upload_avatar", "My Profile")')
+    rendered.should include("crm.flip_form('upload_avatar')")
+    rendered.should include("crm.set_title('upload_avatar', 'My Profile')")
   end
 
   it "edit profile: should hide [Edit Profile] and [Change Password] forms and show [Upload Avatar]" do
     render
 
-    rendered.should have_rjs("upload_avatar") do |rjs|
-      with_tag("form[class=edit_user]")
-    end
-    rendered.should include('crm.hide_form("edit_profile")')
-    rendered.should include('crm.hide_form("change_password")')
-    rendered.should include('crm.flip_form("upload_avatar")')
-    rendered.should include('crm.set_title("upload_avatar"')
+    rendered.should include("jQuery('#upload_avatar').html")
+    rendered.should include("crm.hide_form('edit_profile');")
+    rendered.should include("crm.hide_form('change_password');")
+    rendered.should include("crm.flip_form('upload_avatar');")
+    rendered.should include("crm.set_title('upload_avatar', 'Upload Picture');")
   end
 
 end

data/spec/views/users/{change_password.rjs_spec.rb → change_password.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 "/users/change_password" do
   include UsersHelper
@@ -17,16 +17,16 @@ describe "/users/change_password" do
     it "should flip [Change Password] form" do
       render
 
-      rendered.should_not have_rjs("user_#{@user.id}")
-      rendered.should include('crm.flip_form("change_password"')
-      rendered.should include('crm.set_title("change_password", "My Profile")')
+      rendered.should_not include("user_#{@user.id}")
+      rendered.should include("crm.flip_form('change_password');")
+      rendered.should include("crm.set_title('change_password', 'My Profile');")
     end
 
     it "should show flash message" do
       render
 
-      rendered.should have_rjs("flash")
-      rendered.should include('crm.flash("notice")')
+      rendered.should include("#flash")
+      rendered.should include("crm.flash('notice')")
     end
   end # no errors
 
@@ -35,18 +35,16 @@ describe "/users/change_password" do
       @user.errors.add(:current_password, "error")
       render
 
-      rendered.should have_rjs("change_password") do |rjs|
-        with_tag("form[class=edit_user]")
-      end
-      rendered.should include('$("change_password").visualEffect("shake"')
-      rendered.should include('$("current_password").focus()')
+      rendered.should include("jQuery('#change_password').html")
+      rendered.should include(%Q/jQuery('#change_password').effect("shake"/)
+      rendered.should include("jQuery('#current_password').focus();")
     end
 
     it "should redraw the [Change Password] form and correctly set focus" do
       @user.errors.add(:user_password, "error")
       render
 
-      rendered.should include('$("user_password").focus()')
+      rendered.should include("jQuery('#user_password').focus();")
     end
 
   end # errors

data/spec/views/users/{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 "/users/edit" do
   include UsersHelper
@@ -17,20 +17,18 @@ describe "/users/edit" do
     params[:cancel] = "true"
 
     render
-    rendered.should include('crm.flip_form("edit_profile")')
-    rendered.should include('crm.set_title("edit_profile", "My Profile")')
+    rendered.should include("crm.flip_form('edit_profile')")
+    rendered.should include("crm.set_title('edit_profile', 'My Profile');")
   end
 
   it "edit profile: should hide [Upload Avatar] and [Change Password] forms and show [Edit Profile]" do
     render
 
-    rendered.should have_rjs("edit_profile") do |rjs|
-      with_tag("form[class=edit_user]")
-    end
-    rendered.should include('crm.hide_form("upload_avatar")')
-    rendered.should include('crm.hide_form("change_password")')
-    rendered.should include('crm.flip_form("edit_profile")')
-    rendered.should include('crm.set_title("edit_profile"')
+    rendered.should include("jQuery('#edit_profile').html")
+    rendered.should include("crm.hide_form('upload_avatar');")
+    rendered.should include("crm.hide_form('change_password');")
+    rendered.should include("crm.flip_form('edit_profile');")
+    rendered.should include("crm.set_title('edit_profile', 'Edit Profile');")
   end
 
 end

data/spec/views/users/{password.rjs_spec.rb → password.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 "/users/password" do
   include UsersHelper
@@ -17,21 +17,19 @@ describe "/users/password" do
     params[:cancel] = "true"
 
     render
-    rendered.should include('crm.flip_form("change_password")')
-    rendered.should include('crm.set_title("change_password", "My Profile")')
+    rendered.should include("crm.flip_form('change_password')")
+    rendered.should include("crm.set_title('change_password', 'My Profile')")
   end
 
   it "edit profile: should hide [Edit Profile] and [Upload Avatar] forms and show [Change Password]" do
     render
 
-    rendered.should have_rjs("change_password") do |rjs|
-      with_tag("form[class=edit_user]")
-    end
-    rendered.should include('crm.hide_form("edit_profile")')
-    rendered.should include('crm.hide_form("upload_avatar")')
-    rendered.should include('crm.flip_form("change_password")')
-    rendered.should include('crm.set_title("change_password"')
-    rendered.should include('$("current_password").focus()')
+    rendered.should include("jQuery('#change_password').html")
+    rendered.should include("crm.hide_form('edit_profile');")
+    rendered.should include("crm.hide_form('upload_avatar');")
+    rendered.should include("crm.flip_form('change_password');")
+    rendered.should include("crm.set_title('change_password', 'Change Password');")
+    rendered.should include("jQuery('#current_password').focus();")
   end
 
 end

data/spec/views/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 "/users/update" do
   include UsersHelper
@@ -16,17 +16,17 @@ describe "/users/update" do
   describe "no errors:" do
     it "should flip [Edit Profile] form" do
       render
-      rendered.should include('crm.flip_form("edit_profile")')
+      rendered.should include("crm.flip_form('edit_profile')")
     end
 
     it "should update Welcome, user!" do
       render
-      rendered.should have_rjs("welcome_username")
+      rendered.should include("jQuery('#welcome_username').html('#{@user.first_name}')")
     end
 
     it "should update actual user profile information" do
       render
-      rendered.should have_rjs("profile")
+      rendered.should include("jQuery('#profile').html")
     end
   end # no errors
 
@@ -37,17 +37,9 @@ describe "/users/update" do
 
     it "should redraw the [Edit Profile] form and shake it" do
       render
-      rendered.should have_rjs("edit_profile") do |rjs|
-        with_tag("form[class=edit_user]")
-      end
-      rendered.should include('$("edit_profile").visualEffect("shake"')
-      rendered.should include('$("user_email").focus()')
-    end
-
-    it "should keep welcome or profile information intact" do
-      render
-      rendered.should_not have_rjs("welcome_username")
-      rendered.should_not have_rjs("profile")
+      rendered.should include("jQuery('#edit_profile').html")
+      rendered.should include(%Q/jQuery('#edit_profile').effect("shake"/)
+      rendered.should include("jQuery('#user_email').focus();")
     end
 
   end # errors

data/spec/views/users/{upload_avatar.rjs_spec.rb → upload_avatar.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 "/users/upload_avatar" do
   include UsersHelper
@@ -15,15 +15,15 @@ describe "/users/upload_avatar" do
   describe "no errors:" do
     before do
       @avatar = FactoryGirl.create(:avatar, :entity => current_user)
-      current_user.stub!(:avatar).and_return(@avatar)
+      current_user.stub(:avatar).and_return(@avatar)
       assign(:user, @user = current_user)
     end
 
     it "should flip [Upload Avatar] form" do
       render
-      rendered.should_not have_rjs("user_#{@user.id}")
-      rendered.should include('crm.flip_form("upload_avatar"')
-      rendered.should include('crm.set_title("upload_avatar", "My Profile")')
+      rendered.should_not include("user_#{@user.id}")
+      rendered.should include("crm.flip_form('upload_avatar'")
+      rendered.should include("crm.set_title('upload_avatar', 'My Profile')")
     end
   end # no errors
 
@@ -31,16 +31,14 @@ describe "/users/upload_avatar" do
     before do
       @avatar = FactoryGirl.create(:avatar, :entity => current_user)
       @avatar.errors.add(:image, "error")
-      current_user.stub!(:avatar).and_return(@avatar)
+      current_user.stub(:avatar).and_return(@avatar)
       assign(:user, @user = current_user)
     end
 
     it "should redraw the [Upload Avatar] form and shake it" do
       render
-      rendered.should have_rjs("upload_avatar") do |rjs|
-        with_tag("form[class=edit_user]")
-      end
-      rendered.should include(%Q/$("upload_avatar").visualEffect("shake"/)
+      rendered.should include("jQuery('#upload_avatar').html")
+      rendered.should include(%Q/jQuery('#upload_avatar').effect("shake"/)
     end
   end # errors
 end