fat_free_crm 0.12.3 → 0.13.0

data/spec/views/accounts/{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 "/accounts/edit" do
   include AccountsHelper
@@ -18,9 +18,7 @@ describe "/accounts/edit" do
     params[:cancel] = "true"
 
     render
-    rendered.should have_rjs("account_#{@account.id}") do |rjs|
-      with_tag("li[id=account_#{@account.id}]")
-    end
+    rendered.should include("account_#{@account.id}")
   end
 
   it "cancel from account landing page: should hide [Edit Account] form" do
@@ -28,7 +26,7 @@ describe "/accounts/edit" do
     params[:cancel] = "true"
 
     render
-    rendered.should include('crm.flip_form("edit_account"')
+    rendered.should include("crm.flip_form('edit_account'")
   end
 
   it "edit: should hide previously open [Edit Account] for and replace it with account partial" do
@@ -36,9 +34,7 @@ describe "/accounts/edit" do
     assign(:previous, previous = FactoryGirl.create(:account, :user => current_user))
 
     render
-    rendered.should have_rjs("account_#{previous.id}") do |rjs|
-      with_tag("li[id=account_#{previous.id}]")
-    end
+    rendered.should include("account_#{previous.id}")
   end
 
   it "edit: should remove previously open [Edit Account] if it's no longer available" do
@@ -46,28 +42,24 @@ describe "/accounts/edit" do
     assign(:previous, previous = 41)
 
     render
-    rendered.should include(%Q/crm.flick("account_#{previous}", "remove");/)
+    rendered.should include("crm.flick('account_#{previous}', 'remove');")
   end
 
   it "edit from accounts index page: should turn off highlight, hide [Create Account] form, and replace current account with [edit account] form" do
     params[:cancel] = nil
 
     render
-    rendered.should include(%Q/crm.highlight_off("account_#{@account.id}");/)
-    rendered.should include('crm.hide_form("create_account")')
-    rendered.should have_rjs("account_#{@account.id}") do |rjs|
-      with_tag("form[class=edit_account]")
-    end
+    rendered.should include("crm.highlight_off('account_#{@account.id}');")
+    rendered.should include("crm.hide_form('create_account')")
+    rendered.should include("account_#{@account.id}")
   end
 
   it "edit from account landing page: should show [edit account] form" do
     params[:cancel] = "false"
 
     render
-    rendered.should have_rjs("edit_account") do |rjs|
-      with_tag("form[class=edit_account]")
-    end
-    rendered.should include('crm.flip_form("edit_account"')
+    rendered.should include("edit_account")
+    rendered.should include("crm.flip_form('edit_account'")
   end
 
 end

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

data/spec/views/accounts/{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 "/accounts/new" do
   include AccountsHelper
@@ -17,7 +17,7 @@ describe "/accounts/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 account" do
@@ -25,10 +25,8 @@ describe "/accounts/new" do
       params[:cancel] = nil
       render
 
-      rendered.should have_rjs("create_account") do |rjs|
-        with_tag("form[class=new_account]")
-      end
-      rendered.should include('crm.flip_form("create_account");')
+      rendered.should include("#create_account")
+      rendered.should include("crm.flip_form('create_account');")
     end
   end
 
@@ -37,8 +35,8 @@ describe "/accounts/new" do
       params[:cancel] = "true"
       render
 
-      rendered.should_not have_rjs("create_account")
-      rendered.should include('crm.flip_form("create_account");')
+      rendered.should_not include("#create_account")
+      rendered.should include("crm.flip_form('create_account');")
     end
   end
 

data/spec/views/accounts/show.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 "/accounts/show" do
   include AccountsHelper

data/spec/views/accounts/{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 "/accounts/update" do
   include AccountsHelper
@@ -24,17 +24,15 @@ describe "/accounts/update" do
 
       it "should flip [edit_account] form" do
         render
-        rendered.should_not have_rjs("account_#{@account.id}")
-        rendered.should include('crm.flip_form("edit_account"')
+        rendered.should_not include("account_#{@account.id}")
+        rendered.should include("crm.flip_form('edit_account'")
       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("jQuery('#sidebar').html")
+        rendered.should have_text("Recent Items")
+        rendered.should include("jQuery('#summary').effect('shake'")
       end
     end
 
@@ -45,20 +43,17 @@ describe "/accounts/update" do
 
       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("#sidebar")
+        rendered.should have_text("Account Categories")
+        rendered.should have_text("Recent Items")
       end
 
-      it "should replace [edit_account] form with account partial and highligh it" do
+      it "should replace [edit_account] form with account partial and highlight it" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/accounts"
         render
 
-        rendered.should have_rjs("account_#{@account.id}") do |rjs|
-          with_tag("li[id=account_#{@account.id}]")
-        end
-        rendered.should include(%Q/$("account_#{@account.id}").visualEffect("highlight"/)
+        rendered.should include("#account_#{@account.id}")
+        rendered.should include(%Q/jQuery('#account_#{@account.id}').effect("highlight"/)
       end
     end
   end # no errors
@@ -76,10 +71,8 @@ describe "/accounts/update" do
       it "should redraw the [edit_account] form and shake it" do
         render
 
-        rendered.should have_rjs("edit_account") do |rjs|
-          with_tag("form[class=edit_account]")
-        end
-        rendered.should include('$("edit_account").visualEffect("shake"')
+        rendered.should include("#edit_account")
+        rendered.should include(%Q/jQuery('#edit_account').effect("shake"/)
         rendered.should include('focus()')
       end
     end
@@ -92,10 +85,8 @@ describe "/accounts/update" do
       it "should redraw the [edit_account] form and shake it" do
         render
 
-        rendered.should have_rjs("account_#{@account.id}") do |rjs|
-          with_tag("form[class=edit_account]")
-        end
-        rendered.should include(%Q/$("account_#{@account.id}").visualEffect("shake"/)
+        rendered.should include("account_#{@account.id}")
+        rendered.should include(%Q/jQuery('#account_#{@account.id}').effect("shake"/)
         rendered.should include('focus()')
       end
     end

data/spec/views/admin/field_groups/create.js.haml_spec.rb

@@ -0,0 +1,31 @@
+# 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 "admin/field_groups/create" do
+
+  before do
+    login_and_assign(:admin => true)
+    assign(:field_group, field_group)
+  end
+
+  let(:field_group) { FactoryGirl.create(:field_group, :label => 'test') }
+
+  it "renders javascript" do
+    render
+    view.should render_template("admin/field_groups/create")
+    rendered.should have_text("jQuery('##{field_group.klass_name.downcase}_create_field_group_arrow')")
+    rendered.should have_text("jQuery('##{dom_id(field_group)}').effect('highlight', { duration:1500 });")
+  end
+
+  it "renders javascript for invalid field group" do
+    field_group.stub(:valid?).and_return(false)
+    render
+    view.should render_template("admin/field_groups/create")
+    rendered.should have_text("effect(\"shake\", { duration:250, distance: 6 });")
+  end
+
+end

data/spec/views/admin/field_groups/destroy.js.haml_spec.rb

@@ -0,0 +1,31 @@
+# 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 "admin/field_groups/destroy" do
+
+  before do
+    login_and_assign(:admin => true)
+    assign(:field_group, field_group)
+  end
+
+  let(:field_group) { FactoryGirl.build(:field_group) }
+
+  it "renders destroy javascript" do
+    field_group.stub(:destroyed?).and_return(true)
+    render
+    view.should render_template("admin/field_groups/destroy")
+    rendered.should have_text("slideUp(250)")
+  end
+
+  it "renders 'not destroyed' javascript" do
+    render
+    view.should render_template("admin/field_groups/destroy")
+    rendered.should have_text("Field Group could not be deleted")
+    rendered.should have_text("crm.flash('warning');")
+  end
+
+end

data/spec/views/admin/field_groups/edit.js.haml_spec.rb

@@ -0,0 +1,24 @@
+# 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 "admin/field_groups/edit" do
+
+  before do
+    login_and_assign(:admin => true)
+    assign(:field_group, field_group)
+  end
+
+  let(:field_group) { FactoryGirl.create(:field_group, :label => 'test') }
+
+  it "renders javascript" do
+    render
+    view.should render_template("admin/field_groups/edit")
+    rendered.should have_text("crm.show_form('#{dom_id(field_group, :edit)}')")
+    rendered.should have_text("jQuery('##{dom_id(field_group, :edit)}').html")
+  end
+
+end

data/spec/views/admin/field_groups/new.js.haml_spec.rb

@@ -0,0 +1,25 @@
+# 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 "admin/field_groups/new" do
+
+  before do
+    login_and_assign(:admin => true)
+    assign(:field_group, field_group)
+  end
+
+  let(:field_group) { FactoryGirl.create(:field_group, :label => 'test') }
+
+  it "renders javascript" do
+    render
+    view.should render_template("admin/field_groups/new")
+    rendered.should have_text("crm.flick('empty', 'toggle')")
+    rendered.should have_text("crm.flip_form('#{field_group.klass_name.downcase}_create_field_group')")
+    rendered.should have_text("jQuery('##{field_group.klass_name.downcase}_create_field_group').html")
+  end
+
+end

data/spec/views/admin/field_groups/update.js.haml_spec.rb

@@ -0,0 +1,30 @@
+# 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 "admin/field_groups/update" do
+
+  before do
+    login_and_assign(:admin => true)
+    assign(:field_group, field_group)
+  end
+
+  let(:field_group) { FactoryGirl.create(:field_group, :label => 'test') }
+
+  it "renders javascript" do
+    render
+    view.should render_template("admin/field_groups/update")
+    rendered.should have_text("crm.flip_form('#{dom_id(field_group, :edit)}');")
+    rendered.should have_text("crm.set_title('#{dom_id(field_group)}'")
+  end
+
+  it "renders javascript for invalid field group" do
+    field_group.errors.stub(:empty?).and_return(false)
+    render
+    rendered.should have_text("jQuery('##{dom_id(field_group, :edit)}').effect('shake', { distance:5 }, 250);")
+  end
+
+end

data/spec/views/admin/users/_create.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

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

@@ -19,14 +19,13 @@ describe "admin/users/create" do
     it "should hide [Create User] form and insert user partial" do
       render
 
-      rendered.should have_rjs(:insert, :top) do |rjs|
-        with_tag("li[id=user_#{@user.id}]")
-      end
-      rendered.should include(%Q/$("user_#{@user.id}").visualEffect("highlight"/)
+      rendered.should include(@user.full_name)
+      rendered.should include(@user.username)
+      rendered.should include(%Q/jQuery('#user_#{@user.id}').effect("highlight"/)
     end
 
     # it "should update pagination" do
-    #   rendered.should have_rjs("paginate")
+    #   rendered.should include("#paginate")
     # end
   end
 
@@ -36,10 +35,8 @@ describe "admin/users/create" do
       assign(:users, [ current_user ])
       render
 
-      rendered.should have_rjs("create_user") do |rjs|
-        with_tag("form[class=new_user]")
-      end
-      rendered.should include('$("create_user").visualEffect("shake"')
+      rendered.should include('Please specify username')
+      rendered.should include(%Q/jQuery('#create_user').effect("shake"/)
     end
   end
 

data/spec/views/admin/users/{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 "admin/users/destroy" do
   before do
@@ -20,7 +20,7 @@ describe "admin/users/destroy" do
     it "blinds up destroyed user partial" do
       render
 
-      rendered.should include(%Q/$("user_#{@user.id}").visualEffect("blind_up"/)
+      rendered.should include('slideUp')
     end
   end
 
@@ -32,21 +32,20 @@ describe "admin/users/destroy" do
     it "should remove confirmation panel" do
       render
 
-      rendered.should include(%Q/crm.flick("#{dom_id(@user, :confirm)}", "remove");/)
+      rendered.should include(%Q/crm.flick('#{dom_id(@user, :confirm)}', 'remove');/)
     end
 
     it "should shake user partial" do
       render
 
-      rendered.should include(%Q/$("user_#{@user.id}").visualEffect("shake"/)
+      rendered.should include(%Q/jQuery('#user_#{@user.id}').effect('shake'/)
     end
 
     it "should show flash message" do
       render
 
-      rendered.should have_rjs("flash")
-      rendered.should include('crm.flash("warning")')
+      rendered.should include('flash')
+      rendered.should include(%Q/crm.flash('warning')/)
     end
   end
 end
-