fat_free_crm 0.12.3 → 0.13.0

data/spec/models/fields/field_spec.rb

@@ -52,7 +52,7 @@ describe Field do
       :label => "Availability",
       :name  => "availability"
     )
-    object = mock('Object')
+    object = double('Object')
 
     #  as  |  value  |  expected
     [["check_boxes", [1, 2, 3],               "1, 2<br />3"],
@@ -60,7 +60,7 @@ describe Field do
      ["checkbox",    1,                       "yes"],
      ["date",        DateTime.new(2011,4,19), DateTime.new(2011,4,19).strftime(I18n.t("date.formats.mmddyy")) ]].each do |as, value, expected|
       field.as = as
-      object.stub!(field.name).and_return(value)
+      object.stub(field.name).and_return(value)
       field.render_value(object).should == expected
     end
   end

data/spec/models/observers/entity_observer_spec.rb

@@ -11,7 +11,7 @@ describe EntityObserver do
       let(:assignee) { FactoryGirl.create(:user) }
       let(:assigner) { FactoryGirl.create(:user) }
       let!(:entity)  { FactoryGirl.build(entity_type, :user => assigner, :assignee => assignee) }
-      let(:mail) { mock('mail', :deliver => true) }
+      let(:mail) { double('mail', :deliver => true) }
 
       before :each do
         PaperTrail.stub(:whodunnit).and_return(assigner)
@@ -40,7 +40,7 @@ describe EntityObserver do
       let(:assignee) { FactoryGirl.create(:user) }
       let(:assigner) { FactoryGirl.create(:user) }
       let!(:entity)  { FactoryGirl.create(entity_type, :user => FactoryGirl.create(:user)) }
-      let(:mail) { mock('mail', :deliver => true) }
+      let(:mail) { double('mail', :deliver => true) }
 
       before :each do
         PaperTrail.stub(:whodunnit).and_return(assigner)

data/spec/models/users/user_spec.rb

@@ -60,14 +60,14 @@ describe User do
       it "should not destroy the user if she owns #{asset}" do
         FactoryGirl.create(asset, :user => @user)
         @user.destroy
-        lambda { User.find(@user) }.should_not raise_error(ActiveRecord::RecordNotFound)
+        expect { User.find(@user) }.to_not raise_error()
         @user.destroyed?.should == false
       end
 
       it "should not destroy the user if she has #{asset} assigned" do
         FactoryGirl.create(asset, :assignee => @user)
         @user.destroy
-        lambda { User.find(@user) }.should_not raise_error(ActiveRecord::RecordNotFound)
+        expect { User.find(@user) }.to_not raise_error()
         @user.destroyed?.should == false
       end
     end
@@ -77,20 +77,20 @@ describe User do
       account = FactoryGirl.create(:account, :user => current_user)
       FactoryGirl.create(:comment, :user => @user, :commentable => account)
       @user.destroy
-      lambda { User.find(@user) }.should_not raise_error(ActiveRecord::RecordNotFound)
+      expect { User.find(@user) }.to_not raise_error()
       @user.destroyed?.should == false
     end
 
     it "should not destroy the current user" do
       login
       current_user.destroy
-      lambda { current_user.reload }.should_not raise_error(ActiveRecord::RecordNotFound)
+      expect { current_user.reload }.to_not raise_error()
       current_user.should_not be_destroyed
     end
 
     it "should destroy the user" do
       @user.destroy
-      lambda { User.find(@user) }.should raise_error(ActiveRecord::RecordNotFound)
+      expect { User.find(@user) }.to raise_error(ActiveRecord::RecordNotFound)
       @user.should be_destroyed
     end
 
@@ -182,9 +182,9 @@ describe User do
     end
 
     it "should update I18n.locale if proference[:locale] is set" do
-      @user.preference[:locale] = :esperanto
+      @user.preference[:locale] = :es
       @user.set_individual_locale
-      I18n.locale.should == :esperanto
+      I18n.locale.should == :es
     end
 
     it "should not update I18n.locale if proference[:locale] is not set" do

data/spec/routing/comments_routing_spec.rb

@@ -12,14 +12,6 @@ describe CommentsController do
       { :get => "/comments" }.should route_to(:controller => "comments", :action => "index")
     end
 
-    it "recognizes and generates #new" do
-      { :get => "/comments/new" }.should route_to(:controller => "comments", :action => "new")
-    end
-
-    it "recognizes and generates #show" do
-      { :get => "/comments/1" }.should route_to(:controller => "comments", :action => "show", :id => "1")
-    end
-
     it "recognizes and generates #edit" do
       { :get => "/comments/1/edit" }.should route_to(:controller => "comments", :action => "edit", :id => "1")
     end
@@ -37,4 +29,3 @@ describe CommentsController do
     end
   end
 end
-

data/spec/shared/controllers.rb

@@ -3,103 +3,101 @@
 # 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
 #------------------------------------------------------------------------------
-module SharedControllerSpecs
 
-  shared_examples "auto complete" do
-    before(:each) do
-      @query = "Hello"
-    end
+shared_examples "auto complete" do
+  before(:each) do
+    @query = "Hello"
+  end
 
-    it "should do the search and find records that match autocomplete query" do
-      post :auto_complete, :auto_complete_query => @query
-      assigns[:query].should == @query
-      assigns[:auto_complete].should == @auto_complete_matches # Each controller must define it.
-    end
+  it "should do the search and find records that match autocomplete query" do
+    post :auto_complete, :auto_complete_query => @query
+    assigns[:query].should == @query
+    assigns[:auto_complete].should == @auto_complete_matches # Each controller must define it.
+  end
 
-    it "should save current autocomplete controller in a session" do
-      post :auto_complete, :auto_complete_query => @query
+  it "should save current autocomplete controller in a session" do
+    post :auto_complete, :auto_complete_query => @query
 
-      # We don't save Admin/Users autocomplete controller in a session since Users are not
-      # exposed through the Jumpbox.
-      unless controller.class.to_s.starts_with?("Admin::")
-        session[:auto_complete].should == @controller.controller_name.to_sym
-      end
+    # We don't save Admin/Users autocomplete controller in a session since Users are not
+    # exposed through the Jumpbox.
+    unless controller.class.to_s.starts_with?("Admin::")
+      session[:auto_complete].should == @controller.controller_name.to_sym
     end
+  end
 
-    it "should render application/_auto_complete template" do
-      post :auto_complete, :auto_complete_query => @query
-      response.should render_template("application/_auto_complete")
-    end
+  it "should render application/_auto_complete template" do
+    post :auto_complete, :auto_complete_query => @query
+    response.should render_template("application/_auto_complete")
   end
+end
 
-  shared_examples "attach" do
-    it "should attach existing asset to the parent asset of different type" do
-      xhr :put, :attach, :id => @model.id, :assets => @attachment.class.name.tableize, :asset_id => @attachment.id
-      @model.send(@attachment.class.name.tableize).should include(@attachment)
-      assigns[:attachment].should == @attachment
-      assigns[:attached].should == [ @attachment ]
-      if @model.is_a?(Campaign) && (@attachment.is_a?(Lead) || @attachment.is_a?(Opportunity))
-        assigns[:campaign].should == @attachment.reload.campaign
-      end
-      if @model.is_a?(Account) && @attachment.respond_to?(:account) # Skip Tasks...
-        assigns[:account].should == @attachment.reload.account
-      end
-      response.should render_template("entities/attach")
+shared_examples "attach" do
+  it "should attach existing asset to the parent asset of different type" do
+    xhr :put, :attach, :id => @model.id, :assets => @attachment.class.name.tableize, :asset_id => @attachment.id
+    @model.send(@attachment.class.name.tableize).should include(@attachment)
+    assigns[:attachment].should == @attachment
+    assigns[:attached].should == [ @attachment ]
+    if @model.is_a?(Campaign) && (@attachment.is_a?(Lead) || @attachment.is_a?(Opportunity))
+      assigns[:campaign].should == @attachment.reload.campaign
     end
+    if @model.is_a?(Account) && @attachment.respond_to?(:account) # Skip Tasks...
+      assigns[:account].should == @attachment.reload.account
+    end
+    response.should render_template("entities/attach")
+  end
 
-    it "should not attach the asset that is already attached" do
-      if @model.is_a?(Campaign) && (@attachment.is_a?(Lead) || @attachment.is_a?(Opportunity))
-        @attachment.update_attribute(:campaign_id, @model.id)
-      else
-        @model.send(@attachment.class.name.tableize) << @attachment
-      end
-
-      xhr :put, :attach, :id => @model.id, :assets => @attachment.class.name.tableize, :asset_id => @attachment.id
-      assigns[:attached].should == nil
-      response.should render_template("entities/attach")
+  it "should not attach the asset that is already attached" do
+    if @model.is_a?(Campaign) && (@attachment.is_a?(Lead) || @attachment.is_a?(Opportunity))
+      @attachment.update_attribute(:campaign_id, @model.id)
+    else
+      @model.send(@attachment.class.name.tableize) << @attachment
     end
 
-    it "should display flash warning when the model is no longer available" do
-      @model.destroy
+    xhr :put, :attach, :id => @model.id, :assets => @attachment.class.name.tableize, :asset_id => @attachment.id
+    assigns[:attached].should == nil
+    response.should render_template("entities/attach")
+  end
 
-      xhr :put, :attach, :id => @model.id, :assets => @attachment.class.name.tableize, :asset_id => @attachment.id
-      flash[:warning].should_not == nil
-      response.body.should == "window.location.reload();"
-    end
-    it "should display flash warning when the attachment is no longer available" do
-      @attachment.destroy
+  it "should display flash warning when the model is no longer available" do
+    @model.destroy
 
-      xhr :put, :attach, :id => @model.id, :assets => @attachment.class.name.tableize, :asset_id => @attachment.id
-      flash[:warning].should_not == nil
-      response.body.should == "window.location.reload();"
-    end
+    xhr :put, :attach, :id => @model.id, :assets => @attachment.class.name.tableize, :asset_id => @attachment.id
+    flash[:warning].should_not == nil
+    response.body.should == "window.location.reload();"
   end
+  it "should display flash warning when the attachment is no longer available" do
+    @attachment.destroy
 
-  shared_examples "discard" do
-    it "should discard the attachment without deleting it" do
-      xhr :post, :discard, :id => @model.id, :attachment => @attachment.class.name, :attachment_id => @attachment.id
-      assigns[:attachment].should == @attachment.reload                     # The attachment should still exist.
-      @model.reload.send("#{@attachment.class.name.tableize}").should == [] # But no longer associated with the model.
-      assigns[:account].should == @model if @model.is_a?(Account)
-      assigns[:campaign].should == @model if @model.is_a?(Campaign)
+    xhr :put, :attach, :id => @model.id, :assets => @attachment.class.name.tableize, :asset_id => @attachment.id
+    flash[:warning].should_not == nil
+    response.body.should == "window.location.reload();"
+  end
+end
 
-      response.should render_template("entities/discard")
-    end
+shared_examples "discard" do
+  it "should discard the attachment without deleting it" do
+    xhr :post, :discard, :id => @model.id, :attachment => @attachment.class.name, :attachment_id => @attachment.id
+    assigns[:attachment].should == @attachment.reload                     # The attachment should still exist.
+    @model.reload.send("#{@attachment.class.name.tableize}").should == [] # But no longer associated with the model.
+    assigns[:account].should == @model if @model.is_a?(Account)
+    assigns[:campaign].should == @model if @model.is_a?(Campaign)
 
-    it "should display flash warning when the model is no longer available" do
-      @model.destroy
+    response.should render_template("entities/discard")
+  end
 
-      xhr :post, :discard, :id => @model.id, :attachment => @attachment.class.name, :attachment_id => @attachment.id
-      flash[:warning].should_not == nil
-      response.body.should == "window.location.reload();"
-    end
+  it "should display flash warning when the model is no longer available" do
+    @model.destroy
 
-    it "should display flash warning when the attachment is no longer available" do
-      @attachment.destroy
+    xhr :post, :discard, :id => @model.id, :attachment => @attachment.class.name, :attachment_id => @attachment.id
+    flash[:warning].should_not == nil
+    response.body.should == "window.location.reload();"
+  end
 
-      xhr :post, :discard, :id => @model.id, :attachment => @attachment.class.name, :attachment_id => @attachment.id
-      flash[:warning].should_not == nil
-      response.body.should == "window.location.reload();"
-    end
+  it "should display flash warning when the attachment is no longer available" do
+    @attachment.destroy
+
+    xhr :post, :discard, :id => @model.id, :attachment => @attachment.class.name, :attachment_id => @attachment.id
+    flash[:warning].should_not == nil
+    response.body.should == "window.location.reload();"
   end
 end

data/spec/shared/models.rb

@@ -5,7 +5,7 @@
 #------------------------------------------------------------------------------
 require "cancan/matchers"
 
-shared_examples "exportable" do
+shared_examples_for "exportable" do
   it "Model#export returns all records with extra attributes added" do
 
     # User/assignee for the second record has no first/last name.

data/spec/spec_helper.rb

@@ -11,7 +11,7 @@ require 'rspec/rails'
 require 'capybara/rails'
 
 require 'acts_as_fu'
-require 'factory_girl_rails'
+require 'factory_girl'
 require 'ffaker'
 
 require 'coveralls'
@@ -38,7 +38,6 @@ RSpec.configure do |config|
 
   # RSpec configuration options for Fat Free CRM.
   config.include RSpec::Rails::Matchers
-  config.include(FactoryGirl::Syntax::Methods)
 
   config.before(:each) do
     # Overwrite locale settings within "config/settings.yml" if necessary.

data/spec/support/auth_macros.rb

@@ -17,8 +17,8 @@ end
 #----------------------------------------------------------------------------
 def login(user_stubs = {}, session_stubs = {})
   User.current_user = @current_user = FactoryGirl.create(:user, user_stubs)
-  @current_user_session = mock(Authentication, {:record => current_user}.merge(session_stubs))
-  Authentication.stub!(:find).and_return(@current_user_session)
+  @current_user_session = double(Authentication, {:record => current_user}.merge(session_stubs))
+  Authentication.stub(:find).and_return(@current_user_session)
   #set_timezone
 end
 alias :require_user :login
@@ -33,7 +33,7 @@ end
 def logout
   @current_user = nil
   @current_user_session = nil
-  Authentication.stub!(:find).and_return(nil)
+  Authentication.stub(:find).and_return(nil)
 end
 alias :require_no_user :logout
 

data/spec/support/mail_processor_mocks.rb

@@ -5,31 +5,31 @@
 #------------------------------------------------------------------------------
 module MockIMAP
   def mock_imap
-    @imap = mock
+    @imap = double
     @settings = @crawler.instance_variable_get("@settings")
     @settings[:address] = @mock_address
-    Net::IMAP.stub!(:new).with(@settings[:server], @settings[:port], @settings[:ssl]).and_return(@imap)
+    Net::IMAP.stub(:new).with(@settings[:server], @settings[:port], @settings[:ssl]).and_return(@imap)
   end
 
   def mock_connect
     mock_imap
-    @imap.stub!(:login).and_return(true)
-    @imap.stub!(:select).and_return(true)
+    @imap.stub(:login).and_return(true)
+    @imap.stub(:select).and_return(true)
   end
 
   def mock_disconnect
-    @imap.stub!(:disconnected?).and_return(false)
-    @imap.stub!(:logout).and_return(true)
-    @imap.stub!(:disconnect).and_return(true)
+    @imap.stub(:disconnected?).and_return(false)
+    @imap.stub(:logout).and_return(true)
+    @imap.stub(:disconnect).and_return(true)
   end
 
   def mock_message(body)
-    @fetch_data = mock
-    @fetch_data.stub!(:attr).and_return("RFC822" => body)
-    @imap.stub!(:uid_search).and_return([ :uid ])
-    @imap.stub!(:uid_fetch).and_return([ @fetch_data ])
-    @imap.stub!(:uid_copy).and_return(true)
-    @imap.stub!(:uid_store).and_return(true)
+    @fetch_data = double
+    @fetch_data.stub(:attr).and_return("RFC822" => body)
+    @imap.stub(:uid_search).and_return([ :uid ])
+    @imap.stub(:uid_fetch).and_return([ @fetch_data ])
+    @imap.stub(:uid_copy).and_return(true)
+    @imap.stub(:uid_store).and_return(true)
     body
   end
 end

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

data/spec/views/accounts/{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 "/accounts/create" do
   include AccountsHelper
@@ -23,21 +23,18 @@ describe "/accounts/create" do
     end
 
     it "should hide [Create Account] form and insert account partial" do
-      rendered.should have_rjs(:insert, :top) do |rjs|
-        with_tag("li[id=account_#{@account.id}]")
-      end
-      rendered.should include(%Q/$("account_#{@account.id}").visualEffect("highlight"/)
+      rendered.should include("jQuery('#accounts').prepend('<li class=\\'account highlight\\' id=\\'account_#{@account.id}\\'")
+      rendered.should include(%Q/jQuery('#account_#{@account.id}').effect("highlight"/)
     end
 
     it "should update pagination" do
-      rendered.should have_rjs("paginate")
+      rendered.should include("#paginate")
     end
 
     it "should refresh accounts sidebar" 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("Account Categories")
+      rendered.should have_text("Recent Items")
     end
   end
 
@@ -47,10 +44,8 @@ describe "/accounts/create" do
       assign(:users, [ current_user ])
       render
 
-      rendered.should have_rjs("create_account") do |rjs|
-        with_tag("form[class=new_account]")
-      end
-      rendered.should include('$("create_account").visualEffect("shake"')
+      rendered.should include("#create_account")
+      rendered.should include(%Q/jQuery('#create_account').effect("shake"/)
     end
   end
 

data/spec/views/accounts/{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 "/accounts/destroy" do
   include AccountsHelper
@@ -17,19 +17,17 @@ describe "/accounts/destroy" do
   end
 
   it "should blind up destroyed account partial" do
-    rendered.should include(%Q/$("account_#{@account.id}").visualEffect("blind_up"/)
+    rendered.should include("slideUp")
   end
 
   it "should update accounts pagination" do
-    rendered.should have_rjs("paginate")
+    rendered.should include("#paginate")
   end
 
   it "should update accounts sidebar" 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("Account Categories")
+    rendered.should have_text("Recent Items")
   end
 
 end
-