pipeline_deals 0.1.0 → 0.3.0

data/spec/cassettes/deals_filtered_by_custom_field.yml

@@ -0,0 +1,95 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://localhost:3000/api/v3/deals.json?api_key=iJHyFkMUBSfjUovt29&conditions%5Bcustom_label_11%5D%5Bfrom%5D=3&conditions%5Bcustom_label_11%5D%5Bto%5D=7
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Tue, 20 May 2014 17:01:17 GMT
+      Status:
+      - 200 OK
+      Connection:
+      - close
+      Content-Type:
+      - application/json; charset=utf-8
+      X-Runtime:
+      - '2196'
+      Etag:
+      - ! '"6de5fe702482b9cbb365cafffc8b4c51"'
+      Cache-Control:
+      - private, max-age=0, must-revalidate
+      Content-Length:
+      - '941'
+      Set-Cookie:
+      - is_legacy_user=; domain=pipelinedeals.com; path=/; expires=Thu, 01-Jan-1970
+        00:00:00 GMT
+    body:
+      encoding: US-ASCII
+      string: ! '{"entries":[{"closed_time":null,"company_id":28,"created_at":"2014/05/20
+        12:12:30 -0400","deal_stage_id":3,"expected_close_date":"2014/05/22","expected_close_date_event_id":3,"id":10,"import_id":null,"is_archived":false,"is_example":null,"name":"Big
+        Deal","primary_contact_id":null,"probability":25,"source_id":4,"status":2,"summary":"Cool
+        Deal Summary...\r\nMultiple lines!","updated_at":"2014/05/20 12:12:32 -0400","user_id":2,"value_in_cents":3500,"user":{"id":2,"first_name":"Maggie","last_name":"Zemlak"},"deal_stage":{"id":3,"name":"Request
+        for Info","percent":25},"people":[],"company":{"id":28,"name":"The Random
+        Company"},"source":{"id":4,"name":"Trade Show"},"primary_contact":null,"collaborators":[],"shared_user_ids":[],"person_ids":[],"custom_fields":{"custom_label_1":2,"custom_label_2":6,"custom_label_3":7,"custom_label_4":8,"custom_label_11":5}}],"pagination":{"page":1,"page_var":"page","per_page":200,"pages":1,"total":1}}'
+    http_version: 
+  recorded_at: Tue, 20 May 2014 17:01:17 GMT
+- request:
+    method: get
+    uri: http://localhost:3000/api/v3/deals.json?api_key=iJHyFkMUBSfjUovt29&conditions%5Bcustom_label_12%5D%5B0%5D=19&conditions%5Bcustom_label_12%5D%5B1%5D=20
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Tue, 20 May 2014 18:08:39 GMT
+      Status:
+      - 200 OK
+      Connection:
+      - close
+      Content-Type:
+      - application/json; charset=utf-8
+      X-Runtime:
+      - '2459'
+      Etag:
+      - ! '"73501f87ac92c9c2fd3b0cfb3eab6c7f"'
+      Cache-Control:
+      - private, max-age=0, must-revalidate
+      Content-Length:
+      - '839'
+      Set-Cookie:
+      - is_legacy_user=; domain=pipelinedeals.com; path=/; expires=Thu, 01-Jan-1970
+        00:00:00 GMT
+    body:
+      encoding: US-ASCII
+      string: ! '{"entries":[{"closed_time":null,"company_id":null,"created_at":"2014/05/20
+        13:16:08 -0400","deal_stage_id":null,"expected_close_date":null,"expected_close_date_event_id":null,"id":11,"import_id":null,"is_archived":false,"is_example":null,"name":"Little
+        Deal","primary_contact_id":null,"probability":null,"source_id":null,"status":null,"summary":null,"updated_at":"2014/05/20
+        13:16:08 -0400","user_id":2,"value_in_cents":null,"user":{"id":2,"first_name":"Maggie","last_name":"Zemlak"},"people":[],"deal_stage":null,"primary_contact":null,"company":null,"collaborators":[],"shared_user_ids":[],"person_ids":[],"custom_fields":{"custom_label_1":null,"custom_label_2":null,"custom_label_3":null,"custom_label_4":0,"custom_label_11":null,"custom_label_12":[20,21]}}],"pagination":{"page":1,"page_var":"page","per_page":200,"pages":1,"total":1}}'
+    http_version: 
+  recorded_at: Tue, 20 May 2014 18:08:39 GMT
+recorded_with: VCR 2.3.0

data/spec/cassettes/get_a_person.yml

@@ -0,0 +1,49 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://localhost:3000/api/v3/people/1.json?api_key=iJHyFkMUBSfjUovt29
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Mon, 19 May 2014 16:28:14 GMT
+      Status:
+      - 200 OK
+      Connection:
+      - close
+      Content-Type:
+      - application/json; charset=utf-8
+      X-Runtime:
+      - '1116'
+      Etag:
+      - ! '"5b1d943b32f448a039b024c24f55a3e2"'
+      Cache-Control:
+      - private, max-age=0, must-revalidate
+      Content-Length:
+      - '1232'
+      Set-Cookie:
+      - is_legacy_user=; domain=pipelinedeals.com; path=/; expires=Thu, 01-Jan-1970
+        00:00:00 GMT
+    body:
+      encoding: US-ASCII
+      string: ! '{"company_id":1,"created_at":"2014/05/19 08:54:59 -0400","email":null,"email2":null,"facebook_url":null,"fax":null,"first_name":"Leonard","home_address_1":null,"home_address_2":null,"home_city":null,"home_country":null,"home_email":null,"home_phone":null,"home_postal_code":null,"home_state":null,"id":1,"instant_message":null,"last_name":"Jakubowski","linked_in_url":null,"mobile":null,"phone":null,"position":null,"twitter":null,"type":"Contact","updated_at":"2014/05/19
+        12:13:24 -0400","user_id":2,"viewed_at":null,"website":null,"work_address_1":null,"work_address_2":null,"work_city":null,"work_country":null,"work_postal_code":null,"work_state":null,"company_name":"Roob
+        Group","full_name":"Leonard Jakubowski","predefined_contacts_tag_ids":[],"deal_ids":[2],"image_thumb_url":"/images/thumb/missing.png","image_mobile_url":"/images/mobile/missing.png","predefined_contacts_tags":[],"deals":[{"id":2,"name":"reinvent
+        rich infrastructures"}],"lead_source":{"id":2,"name":"Cold Call"},"lead_status":{"hex_color":"C73408","id":2,"name":"Hot"},"company":{"id":1,"name":"Roob
+        Group"},"user":{"id":2,"first_name":"Maggie","last_name":"Zemlak"},"custom_fields":{},"possible_notify_user_ids":[],"total_pipeline":0,"won_deals_total":0}'
+    http_version: 
+  recorded_at: Mon, 19 May 2014 16:28:14 GMT
+recorded_with: VCR 2.3.0

data/spec/cassettes/people_filtered_by_status.yml

@@ -0,0 +1,64 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://localhost:3000/api/v3/people.json?api_key=iJHyFkMUBSfjUovt29&conditions%5Bperson_status%5D%5B0%5D=2
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Mon, 19 May 2014 16:49:32 GMT
+      Status:
+      - 200 OK
+      Connection:
+      - close
+      Content-Type:
+      - application/json; charset=utf-8
+      X-Runtime:
+      - '1594'
+      Etag:
+      - ! '"9c47c29e4e3a8ae3adcdb6eae36ba7ac"'
+      Cache-Control:
+      - private, max-age=0, must-revalidate
+      Content-Length:
+      - '4640'
+      Set-Cookie:
+      - is_legacy_user=; domain=pipelinedeals.com; path=/; expires=Thu, 01-Jan-1970
+        00:00:00 GMT
+    body:
+      encoding: US-ASCII
+      string: ! '{"entries":[{"company_id":1,"created_at":"2014/05/19 08:54:59 -0400","email":null,"email2":null,"facebook_url":null,"fax":null,"first_name":"Leonard","home_address_1":null,"home_address_2":null,"home_city":null,"home_country":null,"home_email":null,"home_phone":null,"home_postal_code":null,"home_state":null,"id":1,"instant_message":null,"last_name":"Jakubowski","linked_in_url":null,"mobile":null,"phone":null,"position":null,"twitter":null,"type":"Contact","updated_at":"2014/05/19
+        12:13:24 -0400","user_id":2,"viewed_at":null,"website":null,"work_address_1":null,"work_address_2":null,"work_city":null,"work_country":null,"work_postal_code":null,"work_state":null,"company_name":"Roob
+        Group","full_name":"Leonard Jakubowski","predefined_contacts_tag_ids":[],"deal_ids":[2],"image_thumb_url":"/images/thumb/missing.png","image_mobile_url":"/images/mobile/missing.png","predefined_contacts_tags":[],"deals":[{"id":2,"name":"reinvent
+        rich infrastructures"}],"lead_source":{"id":2,"name":"Cold Call"},"lead_status":{"hex_color":"C73408","id":2,"name":"Hot"},"company":{"id":1,"name":"Roob
+        Group"},"user":{"id":2,"first_name":"Maggie","last_name":"Zemlak"},"custom_fields":{}},{"company_id":2,"created_at":"2014/05/19
+        08:55:01 -0400","email":null,"email2":null,"facebook_url":null,"fax":null,"first_name":"Kendrick","home_address_1":null,"home_address_2":null,"home_city":null,"home_country":null,"home_email":null,"home_phone":null,"home_postal_code":null,"home_state":null,"id":2,"instant_message":null,"last_name":"Rolfson","linked_in_url":null,"mobile":null,"phone":null,"position":null,"twitter":null,"type":"Contact","updated_at":"2014/05/19
+        11:41:43 -0400","user_id":2,"viewed_at":null,"website":null,"work_address_1":null,"work_address_2":null,"work_city":null,"work_country":null,"work_postal_code":null,"work_state":null,"company_name":"Baumbach,
+        Mitchell and Pfannerstill","full_name":"Kendrick Rolfson","predefined_contacts_tag_ids":[],"deal_ids":[],"image_thumb_url":"/images/thumb/missing.png","image_mobile_url":"/images/mobile/missing.png","predefined_contacts_tags":[],"deals":[],"lead_source":{"id":2,"name":"Cold
+        Call"},"lead_status":{"hex_color":"C73408","id":2,"name":"Hot"},"company":{"id":2,"name":"Baumbach,
+        Mitchell and Pfannerstill"},"user":{"id":2,"first_name":"Maggie","last_name":"Zemlak"},"custom_fields":{}},{"company_id":3,"created_at":"2014/05/19
+        08:55:01 -0400","email":null,"email2":null,"facebook_url":null,"fax":null,"first_name":"Dorcas","home_address_1":null,"home_address_2":null,"home_city":null,"home_country":null,"home_email":null,"home_phone":null,"home_postal_code":null,"home_state":null,"id":3,"instant_message":null,"last_name":"McCullough","linked_in_url":null,"mobile":null,"phone":null,"position":null,"twitter":null,"type":"Contact","updated_at":"2014/05/19
+        11:41:43 -0400","user_id":2,"viewed_at":null,"website":null,"work_address_1":null,"work_address_2":null,"work_city":null,"work_country":null,"work_postal_code":null,"work_state":null,"company_name":"Walker
+        Inc","full_name":"Dorcas McCullough","predefined_contacts_tag_ids":[],"deal_ids":[],"image_thumb_url":"/images/thumb/missing.png","image_mobile_url":"/images/mobile/missing.png","predefined_contacts_tags":[],"deals":[],"lead_source":{"id":2,"name":"Cold
+        Call"},"lead_status":{"hex_color":"C73408","id":2,"name":"Hot"},"company":{"id":3,"name":"Walker
+        Inc"},"user":{"id":2,"first_name":"Maggie","last_name":"Zemlak"},"custom_fields":{}},{"company_id":4,"created_at":"2014/05/19
+        08:55:03 -0400","email":null,"email2":null,"facebook_url":null,"fax":null,"first_name":"Tamia","home_address_1":null,"home_address_2":null,"home_city":null,"home_country":null,"home_email":null,"home_phone":null,"home_postal_code":null,"home_state":null,"id":4,"instant_message":null,"last_name":"Skiles","linked_in_url":null,"mobile":null,"phone":null,"position":null,"twitter":null,"type":"Contact","updated_at":"2014/05/19
+        11:41:43 -0400","user_id":2,"viewed_at":null,"website":null,"work_address_1":null,"work_address_2":null,"work_city":null,"work_country":null,"work_postal_code":null,"work_state":null,"company_name":"Rosenbaum
+        Inc","full_name":"Tamia Skiles","predefined_contacts_tag_ids":[],"deal_ids":[],"image_thumb_url":"/images/thumb/missing.png","image_mobile_url":"/images/mobile/missing.png","predefined_contacts_tags":[],"deals":[],"lead_source":{"id":2,"name":"Cold
+        Call"},"lead_status":{"hex_color":"C73408","id":2,"name":"Hot"},"company":{"id":4,"name":"Rosenbaum
+        Inc"},"user":{"id":2,"first_name":"Maggie","last_name":"Zemlak"},"custom_fields":{}}],"pagination":{"page":1,"page_var":"page","per_page":200,"pages":1,"total":4}}'
+    http_version: 
+  recorded_at: Mon, 19 May 2014 16:49:32 GMT
+recorded_with: VCR 2.3.0

data/spec/cassettes/person_with_company.yml

@@ -0,0 +1,49 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://localhost:3000/api/v3/people/1.json?api_key=iJHyFkMUBSfjUovt29
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Mon, 19 May 2014 16:29:07 GMT
+      Status:
+      - 200 OK
+      Connection:
+      - close
+      Content-Type:
+      - application/json; charset=utf-8
+      X-Runtime:
+      - '1255'
+      Etag:
+      - ! '"5b1d943b32f448a039b024c24f55a3e2"'
+      Cache-Control:
+      - private, max-age=0, must-revalidate
+      Content-Length:
+      - '1232'
+      Set-Cookie:
+      - is_legacy_user=; domain=pipelinedeals.com; path=/; expires=Thu, 01-Jan-1970
+        00:00:00 GMT
+    body:
+      encoding: US-ASCII
+      string: ! '{"company_id":1,"created_at":"2014/05/19 08:54:59 -0400","email":null,"email2":null,"facebook_url":null,"fax":null,"first_name":"Leonard","home_address_1":null,"home_address_2":null,"home_city":null,"home_country":null,"home_email":null,"home_phone":null,"home_postal_code":null,"home_state":null,"id":1,"instant_message":null,"last_name":"Jakubowski","linked_in_url":null,"mobile":null,"phone":null,"position":null,"twitter":null,"type":"Contact","updated_at":"2014/05/19
+        12:13:24 -0400","user_id":2,"viewed_at":null,"website":null,"work_address_1":null,"work_address_2":null,"work_city":null,"work_country":null,"work_postal_code":null,"work_state":null,"company_name":"Roob
+        Group","full_name":"Leonard Jakubowski","predefined_contacts_tag_ids":[],"deal_ids":[2],"image_thumb_url":"/images/thumb/missing.png","image_mobile_url":"/images/mobile/missing.png","predefined_contacts_tags":[],"deals":[{"id":2,"name":"reinvent
+        rich infrastructures"}],"lead_source":{"id":2,"name":"Cold Call"},"lead_status":{"hex_color":"C73408","id":2,"name":"Hot"},"company":{"id":1,"name":"Roob
+        Group"},"user":{"id":2,"first_name":"Maggie","last_name":"Zemlak"},"custom_fields":{},"possible_notify_user_ids":[],"total_pipeline":0,"won_deals_total":0}'
+    http_version: 
+  recorded_at: Mon, 19 May 2014 16:29:07 GMT
+recorded_with: VCR 2.3.0

data/spec/cassettes/person_with_deals.yml

@@ -0,0 +1,49 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://localhost:3000/api/v3/people/1.json?api_key=iJHyFkMUBSfjUovt29
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Mon, 19 May 2014 16:28:29 GMT
+      Status:
+      - 200 OK
+      Connection:
+      - close
+      Content-Type:
+      - application/json; charset=utf-8
+      X-Runtime:
+      - '1242'
+      Etag:
+      - ! '"5b1d943b32f448a039b024c24f55a3e2"'
+      Cache-Control:
+      - private, max-age=0, must-revalidate
+      Content-Length:
+      - '1232'
+      Set-Cookie:
+      - is_legacy_user=; domain=pipelinedeals.com; path=/; expires=Thu, 01-Jan-1970
+        00:00:00 GMT
+    body:
+      encoding: US-ASCII
+      string: ! '{"company_id":1,"created_at":"2014/05/19 08:54:59 -0400","email":null,"email2":null,"facebook_url":null,"fax":null,"first_name":"Leonard","home_address_1":null,"home_address_2":null,"home_city":null,"home_country":null,"home_email":null,"home_phone":null,"home_postal_code":null,"home_state":null,"id":1,"instant_message":null,"last_name":"Jakubowski","linked_in_url":null,"mobile":null,"phone":null,"position":null,"twitter":null,"type":"Contact","updated_at":"2014/05/19
+        12:13:24 -0400","user_id":2,"viewed_at":null,"website":null,"work_address_1":null,"work_address_2":null,"work_city":null,"work_country":null,"work_postal_code":null,"work_state":null,"company_name":"Roob
+        Group","full_name":"Leonard Jakubowski","predefined_contacts_tag_ids":[],"deal_ids":[2],"image_thumb_url":"/images/thumb/missing.png","image_mobile_url":"/images/mobile/missing.png","predefined_contacts_tags":[],"deals":[{"id":2,"name":"reinvent
+        rich infrastructures"}],"lead_source":{"id":2,"name":"Cold Call"},"lead_status":{"hex_color":"C73408","id":2,"name":"Hot"},"company":{"id":1,"name":"Roob
+        Group"},"user":{"id":2,"first_name":"Maggie","last_name":"Zemlak"},"custom_fields":{},"possible_notify_user_ids":[],"total_pipeline":0,"won_deals_total":0}'
+    http_version: 
+  recorded_at: Mon, 19 May 2014 16:28:29 GMT
+recorded_with: VCR 2.3.0

data/spec/pipeline_deals/admin_spec.rb

@@ -1,14 +1,13 @@
 require 'spec_helper'
+
 describe PipelineDeals, "admin data" do
-  before(:each) { PipelineDeals.api_key = ENV['PIPELINEDEALS_API_KEY'] }
   describe "deal stages" do
     it "should list the deal stages" do
       VCR.use_cassette(:list_deal_stages) do
         stages = PipelineDeals::DealStage.find(:all)
-        stages.size.should == 6
-        stages.first.name.should == 'Lost'
+        expect(stages.size).to eq(6)
+        expect(stages.first.name).to eq 'Lost'
       end
     end
   end
 end
-

data/spec/pipeline_deals/companies_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-PipelineDeals.api_key = ENV['PIPELINEDEALS_API_KEY']
+
 describe PipelineDeals::Company do
   it_should_behave_like "a paginated collection"
 
@@ -10,68 +10,10 @@ describe PipelineDeals::Company do
 
   let(:company) { VCR.use_cassette(:get_a_company) { PipelineDeals::Company.find 3 } }
 
-  it "should have many deals" do
+  it "has many deals" do
     VCR.use_cassette(:company_deals) do
-      company.deals.size.should == 1
-      company.deals.first.name.should == "disintermediate value-added technologies"
+      expect(company.deals.size).to eq 1
+      expect(company.deals.first.name).to eq "disintermediate value-added technologies"
     end
   end
-
-  # describe "custom fields" do
-  #   it "should have custom fields" do
-  #     deal.custom_fields.should be_an_instance_of PipelineDeals::Deal::CustomFields
-  #     deal.custom_fields.custom_label_25.should == 2
-  #   end
-
-  #   it "should be able to update custom fields" do
-  #     VCR.use_cassette(:update_deal) do
-  #       deal.custom_fields.custom_label_25 = 1
-  #       deal.save
-  #       PipelineDeals::Deal.find(1).custom_fields.custom_label_25.should == 1
-  #     end
-  #   end
-  # end
-
-  # describe "source" do
-  #   it "should have a source" do
-  #     deal.source.should be_an_instance_of PipelineDeals::LeadSource
-  #     deal.source.name.should == "Cold Call"
-  #   end
-
-  #   it "should be able to update the source" do
-  #     VCR.use_cassette(:update_lead_source) do
-  #       source = PipelineDeals::LeadSource.last
-  #       deal.source_id = source.id
-  #       deal.save
-  #       deal.reload.source.name.should == "Website"
-  #     end
-  #   end
-  # end
-
-  # describe "user" do
-  #   it "should have a user" do
-  #     deal.user.should be_an_instance_of(PipelineDeals::User)
-  #   end
-  # end
-
-  # describe "primary_contact" do
-  #   let(:deal_with_contact) { VCR.use_cassette(:deal_with_primary_contact) { PipelineDeals::Deal.find 2 } }
-  #   it "should have a primary contact" do
-  #     deal_with_contact.primary_contact.should be_an_instance_of PipelineDeals::Person
-  #   end
-  # end
-
-  # describe "company" do
-  #   let(:deal_with_company) { VCR.use_cassette(:deal_with_company) { PipelineDeals::Deal.find 81 } }
-  #   it "should have a company" do
-  #     deal_with_company.company.should be_an_instance_of PipelineDeals::Company
-  #   end
-  # end
-
-  # describe "deal_stage" do
-  #   it "should have a deal stage" do
-  #     deal.deal_stage.should be_an_instance_of PipelineDeals::DealStage
-  #   end
-  # end
 end
-

data/spec/pipeline_deals/deals_spec.rb

@@ -1,87 +1,103 @@
 require 'spec_helper'
-PipelineDeals.api_key = ENV['PIPELINEDEALS_API_KEY']
+
 describe PipelineDeals::Deal do
   it_should_behave_like "a paginated collection"
 
   let(:docs_obj) { deal }
+  let(:cals_obj) { deal }
+  let(:notes_obj) { deal }
   let(:people_obj) { VCR.use_cassette(:deal_with_primary_contact) { PipelineDeals::Deal.find 2 } }
   it_should_behave_like "an object that can have documents"
   it_should_behave_like "an object that can have people"
+  it_should_behave_like "an object that can have notes"
+  it_should_behave_like "an object that can have calendar_entries"
 
   let(:deal) { VCR.use_cassette(:get_a_deal) { PipelineDeals::Deal.find 1 } }
+  let(:deal_with_contact) { VCR.use_cassette(:deal_with_primary_contact) { PipelineDeals::Deal.find 2 } }
+  let(:deal_with_company) { VCR.use_cassette(:deal_with_company) { PipelineDeals::Deal.find 81 } }
 
-  describe "filtering" do
-    it "should be able to filter on stage" do
+  it "creates a deal" do
+    VCR.use_cassette(:deal_create) do
+      new_deal = PipelineDeals::Deal.create(:name => 'a new deal')
+      new_deal.attributes.keys.include?(:id)
+    end
+  end
+
+  describe "filters" do
+    it "on stage" do
       VCR.use_cassette(:deals_filtered_by_stage) do
-        deals = PipelineDeals::Deal.where(conditions: {deal_stage: [2,4]})
-        deals.size.should == 3
-        deals.all? {|deal| [2,4].include?(deal.deal_stage_id) }
+        deals = PipelineDeals::Deal.where(conditions: { deal_stage: [2,4] })
+        expect(deals.size).to eq 3
+        expect(deals.map(&:deal_stage_id)).to include(2)
+        expect(deals.map(&:deal_stage_id)).to include(4)
       end
     end
-  end
 
+    it "on numeric custom field" do
+      VCR.use_cassette(:deals_filtered_by_custom_field) do
+        deals = PipelineDeals::Deal.where(conditions: {custom_label_11: { from: 3, to: 7 }})
+        expect(deals.size).to eq(1)
+        deals.all? {|deal| deal.custom_fields.custom_label_11 >= 3 && deal.custom_fields.custom_label_11 <+ 7 }
+      end
+    end
+
+    it "on picklist custom field" do
+      VCR.use_cassette(:deals_filtered_by_custom_field) do
+        deals = PipelineDeals::Deal.where(conditions: {custom_label_12: [19,20]})
+        expect(deals.size).to eq 1
+        deals.all? { |deal| ([19,20] & deal.custom_fields.custom_label_12).any? }
+      end
+    end
+  end
 
   describe "associations" do
-    it "should have a deal stage" do
-      deal.deal_stage.should be_an_instance_of PipelineDeals::DealStage
-      deal.deal_stage.name.should == "Qualified Lead"
+    it "has a deal stage" do
+      expect(deal.deal_stage).to be_an_instance_of PipelineDeals::DealStage
+      expect(deal.deal_stage.name).to eq "Qualified Lead"
     end
 
-    describe "custom fields" do
-      it "should have custom fields" do
-        deal.custom_fields.should be_an_instance_of PipelineDeals::Deal::CustomFields
-        deal.custom_fields.custom_label_25.should == 2
-      end
+    it "has custom fields" do
+      expect(deal.custom_fields).to be_an_instance_of PipelineDeals::Deal::CustomFields
+      expect(deal.custom_fields.custom_label_25).to eq 2
+    end
 
-      it "should be able to update custom fields" do
-        VCR.use_cassette(:update_deal) do
-          deal.custom_fields.custom_label_25 = 1
-          deal.save
-          PipelineDeals::Deal.find(1).custom_fields.custom_label_25.should == 1
-        end
+    it "can update custom fields" do
+      VCR.use_cassette(:update_deal) do
+        deal.custom_fields.custom_label_25 = 1
+        deal.save
+        custom_label = PipelineDeals::Deal.find(1).custom_fields.custom_label_25
+        expect(custom_label).to eq 1
       end
     end
 
-    describe "source" do
-      it "should have a source" do
-        deal.source.should be_an_instance_of PipelineDeals::LeadSource
-        deal.source.name.should == "Cold Call"
-      end
+    it "has a source" do
+      expect(deal.source).to be_an_instance_of PipelineDeals::LeadSource
+      expect(deal.source.name).to eq "Cold Call"
+    end
 
-      it "should be able to update the source" do
-        VCR.use_cassette(:update_lead_source) do
-          source = PipelineDeals::LeadSource.last
-          deal.source_id = source.id
-          deal.save
-          deal.reload.source.name.should == "Website"
-        end
+    it "can update source" do
+      VCR.use_cassette(:update_lead_source) do
+        source = PipelineDeals::LeadSource.last
+        deal.source_id = source.id
+        deal.save
+        expect(deal.reload.source.name).to eq "Website"
       end
     end
 
-    describe "user" do
-      it "should have a user" do
-        deal.user.should be_an_instance_of(PipelineDeals::User)
-      end
+    it "has a user" do
+      expect(deal.user).to be_an_instance_of(PipelineDeals::User)
     end
 
-    describe "primary_contact" do
-      let(:deal_with_contact) { VCR.use_cassette(:deal_with_primary_contact) { PipelineDeals::Deal.find 2 } }
-      it "should have a primary contact" do
-        deal_with_contact.primary_contact.should be_an_instance_of PipelineDeals::Person
-      end
+    it "has a primary contact" do
+      expect(deal_with_contact.primary_contact).to be_an_instance_of PipelineDeals::Person
     end
 
-    describe "company" do
-      let(:deal_with_company) { VCR.use_cassette(:deal_with_company) { PipelineDeals::Deal.find 81 } }
-      it "should have a company" do
-        deal_with_company.company.should be_an_instance_of PipelineDeals::Company
-      end
+    it "has a company" do
+      expect(deal_with_company.company).to be_an_instance_of PipelineDeals::Company
     end
 
-    describe "deal_stage" do
-      it "should have a deal stage" do
-        deal.deal_stage.should be_an_instance_of PipelineDeals::DealStage
-      end
+    it "has a deal stage" do
+      expect(deal.deal_stage).to be_an_instance_of PipelineDeals::DealStage
     end
   end
 end