fat_free_crm 0.12.3 → 0.13.0

data/spec/controllers/entities/opportunities_controller_spec.rb

@@ -99,7 +99,7 @@ describe OpportunitiesController do
 
     describe "with mime type of JSON" do
       it "should render all opportunities as JSON" do
-        @controller.should_receive(:get_opportunities).and_return(opportunities = mock("Array of Opportunities"))
+        @controller.should_receive(:get_opportunities).and_return(opportunities = double("Array of Opportunities"))
         opportunities.should_receive(:to_json).and_return("generated JSON")
 
         request.env["HTTP_ACCEPT"] = "application/json"
@@ -110,7 +110,7 @@ describe OpportunitiesController do
 
     describe "with mime type of JSON" do
       it "should render all opportunities as JSON" do
-        @controller.should_receive(:get_opportunities).and_return(opportunities = mock("Array of Opportunities"))
+        @controller.should_receive(:get_opportunities).and_return(opportunities = double("Array of Opportunities"))
         opportunities.should_receive(:to_json).and_return("generated JSON")
 
         request.env["HTTP_ACCEPT"] = "application/json"
@@ -121,7 +121,7 @@ describe OpportunitiesController do
 
     describe "with mime type of XML" do
       it "should render all opportunities as xml" do
-        @controller.should_receive(:get_opportunities).and_return(opportunities = mock("Array of Opportunities"))
+        @controller.should_receive(:get_opportunities).and_return(opportunities = double("Array of Opportunities"))
         opportunities.should_receive(:to_xml).and_return("generated XML")
 
         request.env["HTTP_ACCEPT"] = "application/xml"
@@ -348,7 +348,7 @@ describe OpportunitiesController do
 
       before do
         @opportunity = FactoryGirl.build(:opportunity, :user => current_user)
-        Opportunity.stub!(:new).and_return(@opportunity)
+        Opportunity.stub(:new).and_return(@opportunity)
         @stage = Setting.unroll(:opportunity_stage)
       end
 
@@ -426,7 +426,7 @@ describe OpportunitiesController do
       it "should update related campaign revenue if won" do
         @campaign = FactoryGirl.create(:campaign, :revenue => 0)
         @opportunity = FactoryGirl.build(:opportunity, :user => current_user, :stage => "won", :amount => 1100, :discount => 100)
-        Opportunity.stub!(:new).and_return(@opportunity)
+        Opportunity.stub(:new).and_return(@opportunity)
 
         xhr :post, :create, :opportunity => { :name => "Hello world" }, :campaign => @campaign.id, :account => { :name => "Test Account" }
         assigns(:opportunity).should == @opportunity
@@ -436,7 +436,7 @@ describe OpportunitiesController do
 
       it "should add a new comment to the newly created opportunity when specified" do
         @opportunity = FactoryGirl.build(:opportunity, :user => current_user)
-        Opportunity.stub!(:new).and_return(@opportunity)
+        Opportunity.stub(:new).and_return(@opportunity)
 
         xhr :post, :create, :opportunity => { :name => "Opportunity Knocks" }, :account => { :name => "My Account" }, :comment_body => "Awesome comment is awesome"
         @opportunity.reload.comments.map(&:comment).should include("Awesome comment is awesome")
@@ -449,7 +449,7 @@ describe OpportunitiesController do
         @account = Account.new(:user => current_user)
         @opportunity = FactoryGirl.build(:opportunity, :name => nil, :campaign => nil, :user => current_user,
                                      :account => @account)
-        Opportunity.stub!(:new).and_return(@opportunity)
+        Opportunity.stub(:new).and_return(@opportunity)
         @stage = Setting.unroll(:opportunity_stage)
         @accounts = [ FactoryGirl.create(:account, :user => current_user) ]
 
@@ -465,7 +465,7 @@ describe OpportunitiesController do
         @account = FactoryGirl.create(:account, :id => 42, :user => current_user)
         @opportunity = FactoryGirl.build(:opportunity, :name => nil, :campaign => nil, :user => current_user,
                                      :account => @account)
-        Opportunity.stub!(:new).and_return(@opportunity)
+        Opportunity.stub(:new).and_return(@opportunity)
         @stage = Setting.unroll(:opportunity_stage)
 
         # Expect to redraw [create] form with selected account.

data/spec/controllers/home_controller_spec.rb

@@ -157,19 +157,19 @@ describe HomeController do
   describe "activity_user" do
 
     before(:each) do
-      @user = mock(User, :id => 1, :is_a? => true)
-      @cur_user = mock(User)
+      @user = double(User, :id => 1, :is_a? => true)
+      @cur_user = double(User)
     end
 
     it "should find a user by email" do
-      @cur_user.stub!(:pref).and_return(:activity_user => 'billy@example.com')
+      @cur_user.stub(:pref).and_return(:activity_user => 'billy@example.com')
       controller.instance_variable_set(:@current_user, @cur_user)
       User.should_receive(:where).with(:email => 'billy@example.com').and_return([@user])
       controller.send(:activity_user).should == 1
     end
 
     it "should find a user by first name or last name" do
-      @cur_user.stub!(:pref).and_return(:activity_user => 'Billy')
+      @cur_user.stub(:pref).and_return(:activity_user => 'Billy')
       controller.instance_variable_set(:@current_user, @cur_user)
       User.should_receive(:where).with(:first_name => 'Billy').and_return([@user])
       User.should_receive(:where).with(:last_name => 'Billy').and_return([@user])
@@ -177,7 +177,7 @@ describe HomeController do
     end
 
     it "should find a user by first name and last name" do
-      @cur_user.stub!(:pref).and_return(:activity_user => 'Billy Elliot')
+      @cur_user.stub(:pref).and_return(:activity_user => 'Billy Elliot')
       controller.instance_variable_set(:@current_user, @cur_user)
       User.should_receive(:where).with(:first_name => 'Billy', :last_name => "Elliot").and_return([@user])
       User.should_receive(:where).with(:first_name => 'Elliot', :last_name => "Billy").and_return([@user])
@@ -185,7 +185,7 @@ describe HomeController do
     end
 
     it "should return nil when 'all_users' is specified" do
-      @cur_user.stub!(:pref).and_return(:activity_user => 'all_users')
+      @cur_user.stub(:pref).and_return(:activity_user => 'all_users')
       controller.instance_variable_set(:@current_user, @cur_user)
       User.should_not_receive(:where)
       controller.send(:activity_user).should == nil

data/spec/controllers/tasks_controller_spec.rb

@@ -9,7 +9,7 @@ describe TasksController do
 
   def update_sidebar
     @task_total = { :key => :value, :pairs => :etc }
-    Task.stub!(:totals).and_return(@task_total)
+    Task.stub(:totals).and_return(@task_total)
   end
 
   def produce_tasks(user, view)
@@ -120,7 +120,7 @@ describe TasksController do
     TASK_STATUSES.each do |view|
 
       it "should render the requested task as JSON for #{view} view" do
-        Task.stub_chain(:tracked_by, :find).and_return(task = mock("Task"))
+        Task.stub_chain(:tracked_by, :find).and_return(task = double("Task"))
         task.should_receive(:to_json).and_return("generated JSON")
 
         request.env["HTTP_ACCEPT"] = "application/json"
@@ -129,7 +129,7 @@ describe TasksController do
       end
 
       it "should render the requested task as xml for #{view} view" do
-        Task.stub_chain(:tracked_by, :find).and_return(task = mock("Task"))
+        Task.stub_chain(:tracked_by, :find).and_return(task = double("Task"))
         task.should_receive(:to_xml).and_return("generated XML")
 
         request.env["HTTP_ACCEPT"] = "application/xml"
@@ -147,7 +147,7 @@ describe TasksController do
     it "should expose a new task as @task and render [new] template" do
       account = FactoryGirl.create(:account, :user => current_user)
       @task = FactoryGirl.build(:task, :user => current_user, :asset => account)
-      Task.stub!(:new).and_return(@task)
+      Task.stub(:new).and_return(@task)
       @bucket = Setting.unroll(:task_bucket)[1..-1] << [ "On Specific Date...", :specific_time ]
       @category = Setting.unroll(:task_category)
 
@@ -268,7 +268,7 @@ describe TasksController do
 
       it "should expose a newly created task as @task and render [create] template" do
         @task = FactoryGirl.build(:task, :user => current_user)
-        Task.stub!(:new).and_return(@task)
+        Task.stub(:new).and_return(@task)
 
         xhr :post, :create, :task => { :name => "Hello world" }
         assigns(:task).should == @task
@@ -280,7 +280,7 @@ describe TasksController do
       [ "", "?view=pending", "?view=assigned", "?view=completed" ].each do |view|
         it "should update tasks sidebar when [create] is being called from [/tasks#{view}] page" do
           @task = FactoryGirl.build(:task, :user => current_user)
-          Task.stub!(:new).and_return(@task)
+          Task.stub(:new).and_return(@task)
 
           request.env["HTTP_REFERER"] = "http://localhost/tasks#{view}"
           xhr :post, :create, :task => { :name => "Hello world" }
@@ -293,7 +293,7 @@ describe TasksController do
 
       it "should expose a newly created but unsaved task as @lead and still render [create] template" do
         @task = FactoryGirl.build(:task, :name => nil, :user => current_user)
-        Task.stub!(:new).and_return(@task)
+        Task.stub(:new).and_return(@task)
 
         xhr :post, :create, :task => {}
         assigns(:task).should == @task

data/spec/controllers/users_controller_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 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe UsersController do
 
@@ -15,9 +15,11 @@ describe UsersController do
       require_user
     end
 
-    it "should render [show] template" do
-      get :show, :id => current_user.id
-      assigns[:user].should == current_user
+    it "should expose the requested user as @user and render [show] template" do
+      @user = FactoryGirl.create(:user)
+
+      get :show, :id => @user.id
+      assigns[:user].should == @user
       response.should render_template("users/show")
     end
 
@@ -27,30 +29,16 @@ describe UsersController do
       response.should render_template("users/show")
     end
 
-    it "should show user if admin user" do
-      @user = create(:user)
-      require_user(admin: true)
-      get :show, id: @user.id
-      assigns[:user].should == @user
-      response.should render_template("users/show")
-    end
-
-    it "should not show user if not admin user" do
-      @user = create(:user)
-      get :show, id: @user.id
-      response.should redirect_to(root_url)
-    end
-
     describe "with mime type of JSON" do
       before(:each) do
         request.env["HTTP_ACCEPT"] = "application/json"
       end
 
       it "should render the requested user as JSON" do
-        User.should_receive(:find).and_return(current_user)
-        current_user.should_receive(:to_json).and_return("generated JSON")
+        User.should_receive(:find).and_return(user = double("User"))
+        user.should_receive(:to_json).and_return("generated JSON")
 
-        get :show, :id => current_user.id
+        get :show, :id => 42
         response.body.should == "generated JSON"
       end
 
@@ -68,10 +56,10 @@ describe UsersController do
       end
 
       it "should render the requested user as XML" do
-        User.should_receive(:find).and_return(current_user)
-        current_user.should_receive(:to_xml).and_return("generated XML")
+        User.should_receive(:find).and_return(user = double("User"))
+        user.should_receive(:to_xml).and_return("generated XML")
 
-        get :show, :id => current_user.id
+        get :show, :id => 42
         response.body.should == "generated XML"
       end
 
@@ -91,9 +79,9 @@ describe UsersController do
 
     describe "if user is allowed to sign up" do
       it "should expose a new user as @user and render [new] template" do
-        User.should_receive(:can_signup?).and_return(true)
+        @controller.should_receive(:can_signup?).and_return(true)
         @user = FactoryGirl.build(:user)
-        User.stub!(:new).and_return(@user)
+        User.stub(:new).and_return(@user)
 
         get :new
         assigns[:user].should == @user
@@ -103,7 +91,7 @@ describe UsersController do
 
     describe "if user is not allowed to sign up" do
       it "should redirect to login_path" do
-        User.should_receive(:can_signup?).and_return(false)
+        @controller.should_receive(:can_signup?).and_return(false)
 
         get :new
         response.should redirect_to(login_path)
@@ -114,27 +102,14 @@ describe UsersController do
   # GET /users/1/edit                                                      AJAX
   #----------------------------------------------------------------------------
   describe "responding to GET edit" do
-
-    it "should expose current user as @user and render [edit] template" do
+    before(:each) do
       require_user
       @user = current_user
-      xhr :get, :edit, :id => @user.id
-      assigns[:user].should == current_user
-      response.should render_template("users/edit")
-    end
-
-    it "should not allow current user to edit another user" do
-      @user = create(:user)
-      require_user
-      xhr :get, :edit, :id => @user.id
-      expect(response.body).to eql("window.location.reload();")
     end
 
-    it "should allow admin to edit another user" do
-      require_user(admin: true)
-      @user = create(:user)
+    it "should expose current user as @user and render [edit] template" do
       xhr :get, :edit, :id => @user.id
-      assigns[:user].should == @user
+      assigns[:user].should == current_user
       response.should render_template("users/edit")
     end
 
@@ -151,11 +126,10 @@ describe UsersController do
         @email = @username + "@example.com"
         @password = "secret"
         @user = FactoryGirl.build(:user, :username => @username, :email => @email)
-        User.stub!(:new).and_return(@user)
+        User.stub(:new).and_return(@user)
       end
 
       it "exposes a newly created user as @user and redirect to profile page" do
-        require_user(admin: true)
         post :create, :user => { :username => @username, :email => @email, :password => @password, :password_confirmation => @password }
         assigns[:user].should == @user
         flash[:notice].should =~ /welcome/
@@ -163,7 +137,7 @@ describe UsersController do
       end
 
       it "should redirect to login page if user signup needs approval" do
-        Setting.stub!(:user_signup).and_return(:needs_approval)
+        Setting.stub(:user_signup).and_return(:needs_approval)
 
         post :create, :user => { :username => @username, :email => @email, :password => @password, :password_confirmation => @password }
         assigns[:user].should == @user
@@ -174,9 +148,8 @@ describe UsersController do
 
     describe "with invalid params" do
       it "assigns a newly created but unsaved user as @user and renders [new] template" do
-        require_user(admin: true)
         @user = FactoryGirl.build(:user, :username => "", :email => "")
-        User.stub!(:new).and_return(@user)
+        User.stub(:new).and_return(@user)
 
         post :create, :user => {}
         assigns[:user].should == @user
@@ -288,7 +261,7 @@ describe UsersController do
 # -------------------------- Fix later --------------------------------
 #    it "should return errors if the avatar failed to get uploaded and resized" do
 #      @image = fixture_file_upload("spec/fixtures/rails.png", "image/png")
-#      @user.stub!(:save).and_return(false) # make it fail
+#      @user.stub(:save).and_return(false) # make it fail
 
 #      xhr :put, :upload_avatar, :id => @user.id, :avatar => { :image => @image }
 #      @user.avatar.errors.should_not be_empty
@@ -319,7 +292,6 @@ describe UsersController do
   describe "responding to PUT change_password" do
     before(:each) do
       require_user
-      User.stub(:find).and_return(current_user)
       @current_user_session.stub(:unauthorized_record=).and_return(current_user)
       @current_user_session.stub(:save).and_return(current_user)
       @user = current_user

data/spec/features/support/selector_helpers.rb

@@ -5,16 +5,11 @@
 #------------------------------------------------------------------------------
 module SelectorHelpers
   def chosen_select(item_text, options)
-    field_id = find_field(options[:from])[:id]
+    field_id = find_field(options[:from], :visible => false)[:id]
     option_value = page.evaluate_script("jQuery(\"##{field_id} option:contains('#{item_text}')\").val()")#page.evaluate_script("$(\"##{field_id} option:contains('#{item_text}')\").val()")
     page.execute_script("jQuery('##{field_id}').val('#{option_value}')")
   end
 
-  def check_filter(filter_name)
-    filter_checkbox = find(:xpath, "//input[@type='checkbox'][@value='due_#{filter_name}']")
-    filter_checkbox.click
-  end
-
   def click_filter_tab(filter_name)
     tab = find(:xpath, "//div[@class='filters']//td[contains(text(), '#{filter_name}')]")
     tab.click

data/spec/features/tasks_spec.rb

@@ -54,11 +54,11 @@ feature 'Tasks', %q{
     page.should have_content('The task has been created and assigned to Another User')
 
     click_link 'Tasks'
-    check_filter 'tomorrow'
+    page.uncheck('filters_due_tomorrow')
     page.should_not have_content('Task For Someone Else')
 
     click_filter_tab('Assigned')
-    check_filter 'tomorrow'
+    page.check('filters_due_tomorrow')
     find('#main').should have_content('Task For Someone Else')
     find('#main').should have_content('Another User')
 

data/spec/helpers/application_helper_spec.rb

@@ -14,29 +14,29 @@ describe ApplicationHelper do
 
   describe "link_to_emails" do
     it "should add Bcc: if dropbox address is set" do
-      Setting.stub!(:email_dropbox).and_return({ :address => "drop@example.com" })
+      Setting.stub(:email_dropbox).and_return({ :address => "drop@example.com" })
       helper.link_to_email("hello@example.com").should == '<a href="mailto:hello@example.com?bcc=drop@example.com" title="hello@example.com">hello@example.com</a>'
     end
 
     it "should not add Bcc: if dropbox address is not set" do
-      Setting.stub!(:email_dropbox).and_return({ :address => nil })
+      Setting.stub(:email_dropbox).and_return({ :address => nil })
       helper.link_to_email("hello@example.com").should == '<a href="mailto:hello@example.com" title="hello@example.com">hello@example.com</a>'
     end
 
     it "should truncate long emails" do
-      Setting.stub!(:email_dropbox).and_return({ :address => nil })
+      Setting.stub(:email_dropbox).and_return({ :address => nil })
       helper.link_to_email("hello@example.com", 5).should == '<a href="mailto:hello@example.com" title="hello@example.com">he...</a>'
     end
 
     it "should escape HTML entities" do
-      Setting.stub!(:email_dropbox).and_return({ :address => 'dr&op@example.com' })
+      Setting.stub(:email_dropbox).and_return({ :address => 'dr&op@example.com' })
       helper.link_to_email("hell&o@example.com").should == '<a href="mailto:hell&amp;o@example.com?bcc=dr&amp;op@example.com" title="hell&amp;o@example.com">hell&amp;o@example.com</a>'
     end
   end
 
   it "link_to_discard" do
     lead = FactoryGirl.create(:lead)
-    controller.request.stub!(:fullpath).and_return("http://www.example.com/leads/#{lead.id}")
+    controller.request.stub(:fullpath).and_return("http://www.example.com/leads/#{lead.id}")
 
     link = helper.link_to_discard(lead)
     link.should =~ %r|leads/#{lead.id}/discard|
@@ -45,26 +45,26 @@ describe ApplicationHelper do
 
   describe "shown_on_landing_page?" do
     it "should return true for Ajax request made from the asset landing page" do
-      controller.request.stub!(:xhr?).and_return(true)
-      controller.request.stub!(:referer).and_return("http://www.example.com/leads/123")
+      controller.request.stub(:xhr?).and_return(true)
+      controller.request.stub(:referer).and_return("http://www.example.com/leads/123")
       helper.shown_on_landing_page?.should == true
     end
 
     it "should return true for regular request to display asset landing page" do
-      controller.request.stub!(:xhr?).and_return(false)
-      controller.request.stub!(:fullpath).and_return("http://www.example.com/leads/123")
+      controller.request.stub(:xhr?).and_return(false)
+      controller.request.stub(:fullpath).and_return("http://www.example.com/leads/123")
       helper.shown_on_landing_page?.should == true
     end
 
     it "should return false for Ajax request made from page other than the asset landing page" do
-      controller.request.stub!(:xhr?).and_return(true)
-      controller.request.stub!(:referer).and_return("http://www.example.com/leads")
+      controller.request.stub(:xhr?).and_return(true)
+      controller.request.stub(:referer).and_return("http://www.example.com/leads")
       helper.shown_on_landing_page?.should == false
     end
 
     it "should return false for regular request to display page other than asset landing page" do
-      controller.request.stub!(:xhr?).and_return(false)
-      controller.request.stub!(:fullpath).and_return("http://www.example.com/leads")
+      controller.request.stub(:xhr?).and_return(false)
+      controller.request.stub(:fullpath).and_return("http://www.example.com/leads")
       helper.shown_on_landing_page?.should == false
     end
   end
@@ -73,8 +73,8 @@ describe ApplicationHelper do
   
     before(:each) do
       @user = mock_model(User)
-      helper.stub!(:current_user).and_return(@user)
-      controller.stub!(:params).and_return({'action' => 'show', 'controller' => 'contacts'})
+      helper.stub(:current_user).and_return(@user)
+      controller.stub(:params).and_return({'action' => 'show', 'controller' => 'contacts'})
     end
   
     it "should return the contact 'show' outline stored in the user preferences" do