fat_free_crm 0.11.4 → 0.12.0

data/spec/controllers/tasks_controller_spec.rb

@@ -1,3 +1,8 @@
+# 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 File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe TasksController do
@@ -74,9 +79,7 @@ describe TasksController do
 
       it "should render all tasks as JSON for #{view} view" do
         @tasks = produce_tasks(current_user, view)
-
-        request.env["HTTP_ACCEPT"] = "application/json"
-        get :index, :view => view
+        get :index, :view => view, :format => :json
 
         (assigns[:tasks].keys.map(&:to_sym) - @tasks.keys).should == []
         (assigns[:tasks].values.flatten - @tasks.values.flatten).should == []
@@ -93,9 +96,7 @@ describe TasksController do
 
       it "should render all tasks as xml for #{view} view" do
         @tasks = produce_tasks(current_user, view)
-
-        request.env["HTTP_ACCEPT"] = "application/xml"
-        get :index, :view => view
+        get :index, :view => view, :format => :xml
 
         (assigns[:tasks].keys.map(&:to_sym) - @tasks.keys).should == []
         (assigns[:tasks].values.flatten - @tasks.values.flatten).should == []

data/spec/controllers/users_controller_spec.rb

@@ -1,3 +1,8 @@
+# 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 File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe UsersController do

data/spec/factories/account_factories.rb

@@ -1,3 +1,8 @@
+# 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
+#------------------------------------------------------------------------------
 FactoryGirl.define do
   factory :account do
     user

data/spec/factories/campaign_factories.rb

@@ -1,3 +1,8 @@
+# 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
+#------------------------------------------------------------------------------
 FactoryGirl.define do
   factory :campaign do
     user
@@ -20,4 +25,4 @@ FactoryGirl.define do
     updated_at          { FactoryGirl.generate(:time) }
     created_at          { FactoryGirl.generate(:time) }
   end
-end
+end

data/spec/factories/contact_factories.rb

@@ -1,3 +1,8 @@
+# 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
+#------------------------------------------------------------------------------
 FactoryGirl.define do
   factory :contact do
     user                
@@ -36,4 +41,4 @@ FactoryGirl.define do
     updated_at          { FactoryGirl.generate(:time) }
     created_at          { FactoryGirl.generate(:time) }
   end
-end
+end

data/spec/factories/field_factories.rb

@@ -1,3 +1,8 @@
+# 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
+#------------------------------------------------------------------------------
 FactoryGirl.define do
   sequence :klass_name do |x|
     ["Contact", "Account", "Opportunity", "Lead", "Campaign"].sample
@@ -31,4 +36,4 @@ FactoryGirl.define do
   factory :custom_field do
     type    "CustomField"
   end
-end
+end

data/spec/factories/lead_factories.rb

@@ -1,3 +1,8 @@
+# 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
+#------------------------------------------------------------------------------
 FactoryGirl.define do
   factory :lead do
     user                
@@ -26,4 +31,4 @@ FactoryGirl.define do
     updated_at          { FactoryGirl.generate(:time) }
     created_at          { FactoryGirl.generate(:time) }
   end
-end
+end

data/spec/factories/list_factories.rb

@@ -1,6 +1,11 @@
+# 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
+#------------------------------------------------------------------------------
 FactoryGirl.define do
   factory :list do
     name           "Foo List"
     url            "/controller/action"
   end
-end
+end

data/spec/factories/opportunity_factories.rb

@@ -1,4 +1,18 @@
+# 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
+#------------------------------------------------------------------------------
 FactoryGirl.define do
+
+  sequence :opportunity_status do |s|
+    %w(prospecting analysis presentation proposal negotiation final_review won lost).sample
+  end
+
+  sequence :opportunity_open_status do |s|
+    %w(prospecting analysis presentation proposal negotiation final_review).sample
+  end
+
   factory :opportunity do
     user
     campaign
@@ -7,7 +21,7 @@ FactoryGirl.define do
     name                { Faker::Lorem.sentence[0,64] }
     access              "Public"
     source              { %w(campaign cold_call conference online referral self web word_of_mouth other).sample }
-    stage               { OPPORTUNITY_STATUSES.sample }
+    stage               { FactoryGirl.generate(:opportunity_status) }
     probability         { rand(50) }
     amount              { rand(1000) }
     discount            { rand(100) }
@@ -19,10 +33,7 @@ FactoryGirl.define do
   end
 
   factory :opportunity_in_pipeline, :parent => :opportunity do
-    stage { OPPORTUNITY_STATUSES.sample }
+    stage               { FactoryGirl.generate(:opportunity_open_status) }
   end
 
-  factory :open_opportunity, :parent => :opportunity do
-    stage { OPPORTUNITY_STATUSES.sample }
-  end
 end

data/spec/factories/sequences.rb

@@ -1,3 +1,8 @@
+# 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
+#------------------------------------------------------------------------------
 FactoryGirl.define do
   sequence :address do |n|
     Faker::Address.street_address + " " + Faker::Address.secondary_address + "\n"
@@ -23,4 +28,5 @@ FactoryGirl.define do
   sequence :date do |n|
     Date.today - n.days
   end
-end
+
+end

data/spec/factories/setting_factories.rb

@@ -1,3 +1,8 @@
+# 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
+#------------------------------------------------------------------------------
 FactoryGirl.define do
   factory :setting do
     name                "foo"
@@ -5,4 +10,4 @@ FactoryGirl.define do
     updated_at          { FactoryGirl.generate(:time) }
     created_at          { FactoryGirl.generate(:time) }
   end
-end
+end

data/spec/factories/shared_factories.rb

@@ -1,3 +1,8 @@
+# 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
+#------------------------------------------------------------------------------
 FactoryGirl.define do
   factory :version do
     whodunnit           ""

data/spec/factories/subscription_factories.rb

@@ -1,3 +1,8 @@
+# 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
+#------------------------------------------------------------------------------
 # Read about factories at https://github.com/thoughtbot/factory_girl
 
 FactoryGirl.define do

data/spec/factories/tag_factories.rb

@@ -1,5 +1,10 @@
+# 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
+#------------------------------------------------------------------------------
 FactoryGirl.define do
   factory :tag do
     name { Faker::Internet.user_name }
   end
-end
+end

data/spec/factories/task_factories.rb

@@ -1,3 +1,8 @@
+# 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
+#------------------------------------------------------------------------------
 FactoryGirl.define do
   factory :task do
     user                
@@ -19,4 +24,4 @@ FactoryGirl.define do
   factory :completed_task, :parent => :task do
     completed_at { Date.yesterday }
   end
-end
+end

data/spec/factories/user_factories.rb

@@ -1,3 +1,8 @@
+# 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
+#------------------------------------------------------------------------------
 FactoryGirl.define do
   factory :user do
     username            { FactoryGirl.generate(:username) }

data/spec/features/acceptance_helper.rb

@@ -0,0 +1,9 @@
+# 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'
+
+# Put your acceptance spec helpers inside /spec/features/support
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}

data/spec/{acceptance → features}/accounts_spec.rb

@@ -1,4 +1,9 @@
-require File.expand_path("../acceptance_helper.rb", __FILE__)
+# 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 'features/acceptance_helper'
 
 feature 'Accounts', %q{
   In order to increase customer satisfaction
@@ -31,8 +36,8 @@ feature 'Accounts', %q{
     fill_in 'comment_body', :with => 'This account is very important'
     click_button 'Create Account'
 
-    page.should have_content('My new account')
-    click_link 'My new account'
+    find('div#accounts').should have_content('My new account')
+    find('div#accounts').click_link('My new account') # avoid recent items link
     page.should have_content('+1 2345 6789')
     page.should have_content('http://www.example.com')
     page.should have_content('This account is very important')
@@ -58,10 +63,10 @@ feature 'Accounts', %q{
     page.should have_field("comment_body", :with => 'This account is very important')
   end
 
-  scenario 'should view and edit an account', :js => true do
+  scenario 'should view and edit an account', :js => true, :versioning => true do
     FactoryGirl.create(:account, :name => "A new account")
     visit accounts_page
-    click_link 'A new account'
+    find('div#accounts').click_link('A new account')
     page.should have_content('A new account')
     click_link 'Edit'
     fill_in 'account_name', :with => 'A new account *editted*'
@@ -75,7 +80,7 @@ feature 'Accounts', %q{
   scenario 'should delete an account', :js => true do
     FactoryGirl.create(:account, :name => "My new account")
     visit accounts_page
-    click_link 'My new account'
+    find('div#accounts').click_link('My new account')
     click_link 'Delete?'
     page.should have_content('Are you sure you want to delete this account?')
     click_link 'Yes'
@@ -89,12 +94,12 @@ feature 'Accounts', %q{
     find('#accounts').should have_content("Account 1")
     fill_in 'query', :with => "Account 0"
     find('#accounts').should have_content("Account 0")
-    find('#accounts').has_selector?('li', :count => 1)
+    find('#accounts').should_not have_content("Account 1")
     fill_in 'query', :with => "Account"
     find('#accounts').should have_content("Account 0")
     find('#accounts').should have_content("Account 1")
-    find('#accounts').has_selector?('li', :count => 2)
     fill_in 'query', :with => "Contact"
-    find('#accounts').has_selector?('li', :count => 0)
+    find('#accounts').should_not have_content("Account 0")
+    find('#accounts').should_not have_content("Account 1")
   end
 end

data/spec/{acceptance → features}/admin/groups_spec.rb

@@ -1,3 +1,8 @@
+# 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 File.expand_path("../../acceptance_helper.rb", __FILE__)
 
 feature 'Groups tab', %q{

data/spec/{acceptance → features}/admin/users_spec.rb

@@ -1,3 +1,8 @@
+# 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 File.expand_path("../../acceptance_helper.rb", __FILE__)
 
 feature 'Users tab', %q{
@@ -24,10 +29,10 @@ feature 'Users tab', %q{
     chosen_select('Superheroes', :from => 'user_group_ids')
 
     click_button 'Create User'
-    page.should have_content('Captain Thunder')
-    page.should have_content('Weather Inc.')
-    page.should have_content('Superheroes')
-    page.should have_content('lightning@example.com')
+    find('#users').should have_content('Captain Thunder')
+    find('#users').should have_content('Weather Inc.')
+    find('#users').should have_content('Superheroes')
+    find('#users').should have_content('lightning@example.com')
 
   end
 

data/spec/{acceptance → features}/campaigns_spec.rb

@@ -1,3 +1,8 @@
+# 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 File.expand_path("../acceptance_helper.rb", __FILE__)
 
 feature 'Campaigns', %q{
@@ -32,7 +37,7 @@ feature 'Campaigns', %q{
     page.should have_content('Cool Campaign')
     page.should have_content('On Hold')
 
-    click_link 'Cool Campaign'
+    find('div#campaigns').click_link 'Cool Campaign'
     page.should have_content('This campaign is very important')
 
     click_link "Dashboard"
@@ -48,7 +53,7 @@ feature 'Campaigns', %q{
     fill_in 'comment_body', :with => 'This campaign is very important'
     click_button 'Create Campaign'
 
-    page.should have_field("comment_body", :with => 'This campaign is very important')
+    find('#comment_body').should have_content('This campaign is very important')
   end
 
   scenario 'should view and edit a campaign', :js => true do
@@ -60,9 +65,7 @@ feature 'Campaigns', %q{
     select 'Started', :from => 'campaign_status'
     click_button 'Save Campaign'
     page.should have_content('My Even Cooler Campaign')
-    click_link 'Campaigns'
-    page.should have_content('My Even Cooler Campaign')
-
+  page.should have_content('My Even Cooler Campaign')
     click_link 'Dashboard'
     page.should have_content("Bill Murray updated campaign My Even Cooler Campaign")
   end
@@ -75,27 +78,22 @@ feature 'Campaigns', %q{
     page.should have_content('Are you sure you want to delete this campaign?')
     click_link 'Yes'
     page.should have_content('Old Campaign has been deleted.')
-    click_link 'Campaigns'
-    page.should_not have_content('Old Campaign')
+    find('div#campaigns').should_not have_content('Old Campaign')
   end
 
   scenario 'should search for a campaign', :js => true do
-    4.times { |i| FactoryGirl.create(:campaign, :name => "Campaign #{i}") }
+    2.times { |i| FactoryGirl.create(:campaign, :name => "Campaign #{i}") }
     visit campaigns_page
     find('#campaigns').should have_content("Campaign 0")
     find('#campaigns').should have_content("Campaign 1")
-    find('#campaigns').should have_content("Campaign 2")
-    find('#campaigns').should have_content("Campaign 3")
     fill_in 'query', :with => "Campaign 0"
     find('#campaigns').should have_content("Campaign 0")
-    find('#campaigns').has_selector?('li', :count => 1)
+    find('#campaigns').should_not have_content("Campaign 1")
     fill_in 'query', :with => "Campaign"
     find('#campaigns').should have_content("Campaign 0")
     find('#campaigns').should have_content("Campaign 1")
-    find('#campaigns').should have_content("Campaign 2")
-    find('#campaigns').should have_content("Campaign 3")
-    find('#campaigns').has_selector?('li', :count => 4)
-    fill_in 'query', :with => "False campaign"
-    find('#campaigns').has_selector?('li', :count => 0)
+    fill_in 'query', :with => "False"
+    find('#campaigns').should_not have_content("Campaign 0")
+    find('#campaigns').should_not have_content("Campaign 1")
   end
 end

data/spec/{acceptance → features}/contacts_spec.rb

@@ -1,3 +1,8 @@
+# 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 File.expand_path("../acceptance_helper.rb", __FILE__)
 
 feature 'Contacts', %q{
@@ -31,11 +36,9 @@ feature 'Contacts', %q{
     click_link 'Comment'
     fill_in 'comment_body', :with => 'This is a very important person.'
     click_button 'Create Contact'
-    page.should have_content('Testy McTest')
-
-    click_link 'Testy McTest'
+    find('div#contacts').should have_content('Testy McTest')
+    find('div#contacts').click_link 'Testy McTest'
     page.should have_content('This is a very important person.')
-
     click_link "Dashboard"
     page.should have_content('Bill Murray created contact Testy McTest')
     page.should have_content('Bill Murray created comment on Testy McTest')
@@ -62,9 +65,6 @@ feature 'Contacts', %q{
     fill_in 'contact_email', :with => "test.subject@example.com"
     click_button 'Save Contact'
     page.should have_content('Test Subject')
-    click_link 'Contacts'
-    page.should have_content('Test Subject')
-
     click_link 'Dashboard'
     page.should have_content("Bill Murray updated contact Test Subject")
   end
@@ -77,25 +77,22 @@ feature 'Contacts', %q{
     page.should have_content('Are you sure you want to delete this contact?')
     click_link 'Yes'
     page.should have_content('Test Subject has been deleted.')
-    click_link('Contacts')
     page.should_not have_content('Test Subject')
   end
 
   scenario 'should search for a contact', :js => true do
-    3.times { |i| FactoryGirl.create(:contact, :first_name => "Test", :last_name => "Subject \##{i}") }
+    2.times { |i| FactoryGirl.create(:contact, :first_name => "Test", :last_name => "Subject \##{i}") }
     visit contacts_page
     find('#contacts').should have_content('Test Subject #0')
     find('#contacts').should have_content('Test Subject #1')
-    find('#contacts').should have_content('Test Subject #2')
-    fill_in 'query', :with => 'Test Subject #2'
-    find('#contacts').should have_content('Test Subject #2')
-    find('#contacts').has_selector?('li', :count => 1)
+    fill_in 'query', :with => 'Test Subject #1'
+    find('#contacts').should have_content('Test Subject #1')
+    find('#contacts').should_not have_content('Test Subject #0')
     fill_in 'query', :with => 'Test Subject'
     find('#contacts').should have_content('Test Subject #0')
     find('#contacts').should have_content('Test Subject #1')
-    find('#contacts').should have_content('Test Subject #2')
-    find('#contacts').has_selector?('li', :count => 3)
     fill_in 'query', :with => "Fake contact"
-    find('#contacts').has_selector?('li', :count => 0)
+    find('#contacts').should_not have_content('Test Subject #0')
+    find('#contacts').should_not have_content('Test Subject #1')
   end
 end