fat_free_crm 0.11.3 → 0.11.4

data/spec/views/leads/update.rjs_spec.rb

@@ -3,8 +3,8 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 describe "/leads/update" do
   before do
     login_and_assign
-    assign(:lead, @lead = FactoryGirl.create(:lead, :user => @current_user, :assignee => FactoryGirl.create(:user)))
-    assign(:users, [ @current_user ])
+    assign(:lead, @lead = FactoryGirl.create(:lead, :user => current_user, :assignee => FactoryGirl.create(:user)))
+    assign(:users, [ current_user ])
     assign(:campaigns, [ FactoryGirl.create(:campaign) ])
     assign(:lead_status_total, Hash.new(1))
   end
@@ -131,4 +131,3 @@ describe "/leads/update" do
     end
   end # errors
 end
-

data/spec/views/opportunities/_edit.haml_spec.rb

@@ -11,7 +11,7 @@ describe "/opportunities/_edit" do
   end
 
   it "should render [edit opportunity] form" do
-    assign(:users, [ @current_user ])
+    assign(:users, [ current_user ])
     assign(:opportunity, @opportunity = FactoryGirl.create(:opportunity, :campaign => @campaign = FactoryGirl.create(:campaign)))
     render
 
@@ -22,7 +22,7 @@ describe "/opportunities/_edit" do
   end
 
   it "should pick default assignee (Myself)" do
-    assign(:users, [ @current_user ])
+    assign(:users, [ current_user ])
     assign(:opportunity, FactoryGirl.create(:opportunity, :assignee => nil))
     render
 
@@ -33,7 +33,7 @@ describe "/opportunities/_edit" do
 
   it "should show correct assignee" do
     @user = FactoryGirl.create(:user)
-    assign(:users, [ @current_user, @user ])
+    assign(:users, [ current_user, @user ])
     assign(:opportunity, FactoryGirl.create(:opportunity, :assignee => @user))
     render
 
@@ -44,7 +44,7 @@ describe "/opportunities/_edit" do
   end
 
   it "should render background info field if settings require so" do
-    assign(:users, [ @current_user ])
+    assign(:users, [ current_user ])
     assign(:opportunity, FactoryGirl.create(:opportunity))
     Setting.background_info = [ :opportunity ]
 
@@ -53,7 +53,7 @@ describe "/opportunities/_edit" do
   end
 
   it "should not render background info field if settings do not require so" do
-    assign(:users, [ @current_user ])
+    assign(:users, [ current_user ])
     assign(:opportunity, FactoryGirl.create(:opportunity))
     Setting.background_info = []
 
@@ -61,4 +61,3 @@ describe "/opportunities/_edit" do
     rendered.should_not have_tag("textarea[id=opportunity_background_info]")
   end
 end
-

data/spec/views/opportunities/_new.haml_spec.rb

@@ -9,14 +9,14 @@ describe "/opportunities/_new" do
     @account = FactoryGirl.create(:account)
     assign(:account, @account)
     assign(:accounts, [ @account ])
-    assign(:users, [ @current_user ])
+    assign(:users, [ current_user ])
     assign(:stage, Setting.unroll(:opportunity_stage))
   end
 
   it "should render [create opportunity] form" do
     render
     view.should render_template(:partial => "opportunities/_top_section")
-    view.should render_template(:partial => "opportunities/_permissions")
+    view.should render_template(:partial => "entities/_permissions")
 
     rendered.should have_tag("form[class=new_opportunity]")
   end
@@ -42,5 +42,3 @@ describe "/opportunities/_new" do
     rendered.should_not have_tag("textarea[id=opportunity_background_info]")
   end
 end
-
-

data/spec/views/opportunities/create.rjs_spec.rb

@@ -86,9 +86,7 @@ describe "/opportunities/create" do
       end
       rendered.should include('$("create_opportunity").visualEffect("shake"')
       rendered.should include("crm.create_or_select_account")
-      rendered.should include("crm.date_select_popup")
     end
   end
 
 end
-

data/spec/views/opportunities/edit.rjs_spec.rb

@@ -6,8 +6,8 @@ describe "/opportunities/edit" do
   before do
     login_and_assign
 
-    assign(:opportunity, @opportunity = FactoryGirl.create(:opportunity, :user => @current_user))
-    assign(:users, [ @current_user ])
+    assign(:opportunity, @opportunity = FactoryGirl.create(:opportunity, :user => current_user))
+    assign(:users, [ current_user ])
     assign(:account, @account = FactoryGirl.create(:account))
     assign(:accounts, [ @account ])
     assign(:stage, Setting.unroll(:opportunity_stage))
@@ -32,7 +32,7 @@ describe "/opportunities/edit" do
 
   it "edit: should hide previously open [Edit Opportunity] for and replace it with opportunity partial" do
     params[:cancel] = nil
-    assign(:previous, previous = FactoryGirl.create(:opportunity, :user => @current_user))
+    assign(:previous, previous = FactoryGirl.create(:opportunity, :user => current_user))
 
     render
     rendered.should have_rjs("opportunity_#{previous.id}") do |rjs|
@@ -76,4 +76,3 @@ describe "/opportunities/edit" do
   end
 
 end
-

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

@@ -5,7 +5,11 @@ describe "/opportunities/index" do
 
   before do
     login_and_assign
-    assign(:stage, Setting.unroll(:opportunity_stage))
+    view.lookup_context.prefixes << 'entities'
+    assign :stage, Setting.unroll(:opportunity_stage)
+    assign :per_page, Opportunity.per_page
+    assign :sort_by,  Opportunity.sort_by
+    assign :ransack_search, Opportunity.search
   end
 
   it "should render list of accounts if list of opportunities is not empty" do
@@ -13,7 +17,7 @@ describe "/opportunities/index" do
 
     render
     view.should render_template(:partial => "_opportunity")
-    view.should render_template(:partial => "shared/_paginate")
+    view.should render_template(:partial => "shared/_paginate_with_per_page")
   end
 
   it "should render a message if there're no opportunities" do
@@ -22,8 +26,7 @@ describe "/opportunities/index" do
     render
     view.should_not render_template(:partial => "_opportunities")
     view.should render_template(:partial => "shared/_empty")
-    view.should render_template(:partial => "shared/_paginate")
+    view.should render_template(:partial => "shared/_paginate_with_per_page")
   end
 
 end
-

data/spec/views/opportunities/new.rjs_spec.rb

@@ -6,8 +6,8 @@ describe "/opportunities/new" do
   before do
     login_and_assign
     @account = FactoryGirl.create(:account)
-    assign(:opportunity, Opportunity.new(:user => @current_user))
-    assign(:users, [ @current_user ])
+    assign(:opportunity, Opportunity.new(:user => current_user))
+    assign(:users, [ current_user ])
     assign(:account, @account)
     assign(:accounts, [ @account ])
     assign(:stage, Setting.unroll(:opportunity_stage))
@@ -19,13 +19,6 @@ describe "/opportunities/new" do
     rendered.should include('crm.flick("empty", "toggle")')
   end
 
-  it "should hide options form when called from Opportunities index" do
-    controller.request.env["HTTP_REFERER"] = "http://localhost/opportunities"
-    render
-
-    rendered.should include('crm.hide_form("options")')
-  end
-
   describe "new opportunity" do
     it "should render [new] template into :create_opportunity div" do
       params[:cancel] = nil
@@ -41,7 +34,6 @@ describe "/opportunities/new" do
       render
 
       rendered.should include('crm.flip_form("create_opportunity")')
-      rendered.should include('crm.date_select_popup("opportunity_closes_on")')
     end
   end
 
@@ -56,5 +48,3 @@ describe "/opportunities/new" do
   end
 
 end
-
-

data/spec/views/opportunities/show.haml_spec.rb

@@ -8,7 +8,7 @@ describe "/opportunities/show" do
     @opportunity = FactoryGirl.create(:opportunity, :id => 42,
       :contacts => [ FactoryGirl.create(:contact) ])
     assign(:opportunity, @opportunity)
-    assign(:users, [ @current_user ])
+    assign(:users, [ current_user ])
     assign(:comment, Comment.new)
     assign(:timeline, [ FactoryGirl.create(:comment, :commentable => @opportunity) ])
   end
@@ -24,4 +24,3 @@ describe "/opportunities/show" do
   end
 
 end
-

data/spec/views/opportunities/update.rjs_spec.rb

@@ -4,8 +4,8 @@ describe "/opportunities/update" do
   before do
     login_and_assign
 
-    assign(:opportunity, @opportunity = FactoryGirl.create(:opportunity, :user => @current_user, :assignee => FactoryGirl.create(:user)))
-    assign(:users, [ @current_user ])
+    assign(:opportunity, @opportunity = FactoryGirl.create(:opportunity, :user => current_user, :assignee => FactoryGirl.create(:user)))
+    assign(:users, [ current_user ])
     assign(:account, @account = FactoryGirl.create(:account))
     assign(:accounts, [ @account ])
     assign(:stage, Setting.unroll(:opportunity_stage))
@@ -159,4 +159,3 @@ describe "/opportunities/update" do
     end
   end # errors
 end
-

data/spec/views/tasks/_edit.haml_spec.rb

@@ -6,7 +6,7 @@ describe "/tasks/_edit" do
   before do
     login_and_assign
     assign(:task, FactoryGirl.create(:task, :asset => FactoryGirl.create(:account), :bucket => "due_asap"))
-    assign(:users, [ @current_user ])
+    assign(:users, [ current_user ])
     assign(:bucket, %w(due_asap due_today))
     assign(:category, %w(meeting money))
   end
@@ -41,5 +41,3 @@ describe "/tasks/_edit" do
     rendered.should_not have_tag("textarea[id=task_background_info]")
   end
 end
-
-

data/spec/views/tasks/complete.rjs_spec.rb

@@ -42,7 +42,7 @@ describe "/tasks/complete" do
 
   describe "complete from related asset" do
     it "should replace pending partial with the completed one" do
-      @task = FactoryGirl.create(:task, :completed_at => Time.now, :completor => @current_user)
+      @task = FactoryGirl.create(:task, :completed_at => Time.now, :completor => current_user)
       assign(:task, @task)
 
       render
@@ -53,7 +53,7 @@ describe "/tasks/complete" do
     end
 
     it "should update recently viewed items" do
-      @task = FactoryGirl.create(:task, :completed_at => Time.now, :completor => @current_user)
+      @task = FactoryGirl.create(:task, :completed_at => Time.now, :completor => current_user)
       assign(:task, @task)
       controller.request.env["HTTP_REFERER"] = "http://localhost/leads/123"
 
@@ -65,4 +65,3 @@ describe "/tasks/complete" do
   end
 
 end
-

data/spec/views/tasks/create.rjs_spec.rb

@@ -117,8 +117,8 @@ describe "/tasks/create" do
     render
 
     rendered.should include('$("create_task").visualEffect("shake"')
-    rendered.should include(%/$("task_submit").enable()/)
+    rendered.should include(%/$$('#new_task input[type=submit]').invoke('enable')/)
+    
   end
 
 end
-

data/spec/views/tasks/edit.rjs_spec.rb

@@ -5,7 +5,7 @@ describe "/tasks/edit" do
 
   before do
     login_and_assign
-    assign(:users, [ @current_user ])
+    assign(:users, [ current_user ])
     assign(:bucket, Setting.task_bucket[1..-1] << [ "On Specific Date...", :specific_time ])
     assign(:category, Setting.unroll(:task_category))
   end
@@ -75,4 +75,3 @@ describe "/tasks/edit" do
   end
 
 end
-

data/spec/views/tasks/new.rjs_spec.rb

@@ -6,7 +6,7 @@ describe "/tasks/new" do
   before do
     login_and_assign
     assign(:task, FactoryGirl.build(:task))
-    assign(:users, [ @current_user ])
+    assign(:users, [ current_user ])
     assign(:bucket, Setting.task_bucket[1..-1] << [ "On Specific Date...", :specific_time ])
     assign(:category, Setting.unroll(:task_category))
   end
@@ -30,22 +30,6 @@ describe "/tasks/new" do
       end
       rendered.should include('crm.flip_form("create_task");')
     end
-
-    it "should call JavaScript functions to load Calendar popup without time selector" do
-      params[:cancel] = nil
-      Setting.task_calendar_with_time = false
-      render
-
-      rendered.should include('crm.date_select_popup("task_calendar", "task_bucket", false)')
-    end
-
-    it "should call JavaScript functions to load Calendar popup with time selector" do
-      params[:cancel] = nil
-      Setting.task_calendar_with_time = true
-      render
-
-      rendered.should include('crm.date_select_popup("task_calendar", "task_bucket", true)')
-    end
   end
 
   describe "cancel new task" do
@@ -59,4 +43,3 @@ describe "/tasks/new" do
   end
 
 end
-

data/spec/views/users/avatar.rjs_spec.rb

@@ -5,7 +5,7 @@ describe "/users/avatar" do
 
   before do
     login_and_assign
-    assign(:user, @current_user)
+    assign(:user, current_user)
   end
 
   it "cancel: should hide [Upload Avatar] form and restore title" do
@@ -29,4 +29,3 @@ describe "/users/avatar" do
   end
 
 end
-

data/spec/views/users/change_password.rjs_spec.rb

@@ -5,7 +5,7 @@ describe "/users/change_password" do
 
   before do
     login_and_assign
-    assign(:user, @user = @current_user)
+    assign(:user, @user = current_user)
   end
 
   describe "no errors:" do
@@ -46,4 +46,3 @@ describe "/users/change_password" do
 
   end # errors
 end
-

data/spec/views/users/edit.rjs_spec.rb

@@ -5,7 +5,7 @@ describe "/users/edit" do
 
   before do
     login_and_assign
-    assign(:user, @user = @current_user)
+    assign(:user, @user = current_user)
   end
 
   it "cancel: should hide [Edit Profile] form and restore title" do
@@ -29,4 +29,3 @@ describe "/users/edit" do
   end
 
 end
-

data/spec/views/users/password.rjs_spec.rb

@@ -5,7 +5,7 @@ describe "/users/password" do
 
   before do
     login_and_assign
-    assign(:user, @current_user)
+    assign(:user, current_user)
   end
 
   it "cancel: should hide [Change Password] form and restore title" do

data/spec/views/users/update.rjs_spec.rb

@@ -5,7 +5,7 @@ describe "/users/update" do
 
   before do
     login_and_assign
-    assign(:user, @user = @current_user)
+    assign(:user, @user = current_user)
   end
 
   describe "no errors:" do
@@ -47,4 +47,3 @@ describe "/users/update" do
 
   end # errors
 end
-

data/spec/views/users/upload_avatar.rjs_spec.rb

@@ -9,9 +9,9 @@ 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)
-      assign(:user, @user = @current_user)
+      @avatar = FactoryGirl.create(:avatar, :entity => current_user)
+      current_user.stub!(:avatar).and_return(@avatar)
+      assign(:user, @user = current_user)
     end
 
     it "should flip [Upload Avatar] form" do
@@ -24,10 +24,10 @@ describe "/users/upload_avatar" do
 
   describe "validation errors:" do
     before do
-      @avatar = FactoryGirl.create(:avatar, :entity => @current_user)
+      @avatar = FactoryGirl.create(:avatar, :entity => current_user)
       @avatar.errors.add(:image, "error")
-      @current_user.stub!(:avatar).and_return(@avatar)
-      assign(:user, @user = @current_user)
+      current_user.stub!(:avatar).and_return(@avatar)
+      assign(:user, @user = current_user)
     end
 
     it "should redraw the [Upload Avatar] form and shake it" do
@@ -39,4 +39,3 @@ describe "/users/upload_avatar" do
     end
   end # errors
 end
-