xeroizer 2.20.0 → 3.0.0

data/test/unit/models/credit_note_test.rb

@@ -1,16 +1,16 @@
-require 'test_helper'
+require 'unit_test_helper'
 
 class CreditNoteTest < Test::Unit::TestCase
   include TestHelper
-  
+
   def setup
-    @client = Xeroizer::PublicApplication.new(CONSUMER_KEY, CONSUMER_SECRET)    
+    @client = Xeroizer::OAuth2Application.new(CLIENT_ID, CLIENT_SECRET)
     mock_api("CreditNotes")
     @credit_note = @client.CreditNote.first
   end
-  
+
   context "credit note totals" do
-    
+
     should "raise error when trying to set totals directly" do
       assert_raises Xeroizer::SettingTotalDirectlyNotSupported do
         @credit_note.sub_total = 500.0
@@ -22,7 +22,7 @@ class CreditNoteTest < Test::Unit::TestCase
         @credit_note.total = 550.0
       end
     end
-        
+
     should "large-scale testing from API XML" do
       credit_notes = @client.CreditNote.all
       credit_notes.each do | credit_note |
@@ -31,7 +31,7 @@ class CreditNoteTest < Test::Unit::TestCase
         assert_equal(credit_note.attributes[:total], credit_note.total)
       end
     end
-    
+
   end
-  
+
 end

data/test/unit/models/employee_test.rb

@@ -1,11 +1,11 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'test_helper'))
+require 'unit_test_helper'
 
 class EmployeeTest < Test::Unit::TestCase
   include TestHelper
   include Xeroizer::Record
-  
+
   def setup
-    @client = Xeroizer::PublicApplication.new(CONSUMER_KEY, CONSUMER_SECRET)
+    @client = Xeroizer::OAuth2Application.new(CLIENT_ID, CLIENT_SECRET)
     @employee = @client.Employee.build
 
     @employee.employee_id = 'GUID'
@@ -25,7 +25,7 @@ class EmployeeTest < Test::Unit::TestCase
     @employee.employee_group_name = "TEAM A"
     @doc = Nokogiri::XML(@employee.to_xml)
   end
-  
+
   it "should render" do
     assert_equal "GUID", @doc.xpath("//EmployeeID").text
     assert_equal "ACTIVE", @doc.xpath("//Status").text

data/test/unit/models/invoice_test.rb

@@ -1,10 +1,10 @@
-require 'test_helper'
+require 'unit_test_helper'
 
 class InvoiceTest < Test::Unit::TestCase
   include TestHelper
-  
+
   def setup
-    @client = Xeroizer::PublicApplication.new(CONSUMER_KEY, CONSUMER_SECRET)
+    @client = Xeroizer::OAuth2Application.new(CLIENT_ID, CLIENT_SECRET)
     mock_api('Invoices')
     @invoice = @client.Invoice.first
   end
@@ -26,7 +26,7 @@ class InvoiceTest < Test::Unit::TestCase
   end
 
   context "invoice types" do
-    
+
     should "have helpers to determine invoice type" do
       @invoice.type = 'ACCREC'
       assert_equal(true, @invoice.accounts_receivable?)
@@ -36,11 +36,11 @@ class InvoiceTest < Test::Unit::TestCase
       assert_equal(false, @invoice.accounts_receivable?)
       assert_equal(true, @invoice.accounts_payable?)
     end
-    
+
   end
-  
+
   context "invoice totals" do
-    
+
     should "large-scale testing from API XML" do
       invoices = @client.Invoice.all
       invoices.each do | invoice |
@@ -51,7 +51,7 @@ class InvoiceTest < Test::Unit::TestCase
     end
 
   end
-  
+
   context "invoice validations" do
 
     should "build an invalid invoice if there are no attributes" do
@@ -59,7 +59,7 @@ class InvoiceTest < Test::Unit::TestCase
     end
 
     should "build a valid DRAFT invoice with minimal attributes" do
-      invoice = @client.Invoice.build :type => "ACCREC", :contact => { :name => "ABC Limited" }
+      invoice = @client.Invoice.build :type => "ACCREC", :date => Date.today, :contact => { :name => "ABC Limited" }
       assert_equal(true, invoice.valid?)
     end
 
@@ -105,7 +105,7 @@ class InvoiceTest < Test::Unit::TestCase
   end
 
   context "contact shortcuts" do
-    
+
     should "have valid #contact_name and #contact_id without downloading full invoice" do
       invoices = @client.Invoice.all
       invoices.each do |invoice|
@@ -114,13 +114,13 @@ class InvoiceTest < Test::Unit::TestCase
         assert_equal(false, invoice.complete_record_downloaded?)
       end
     end
-    
+
   end
 
   context "updated date" do
     should "get the updated date as utc" do
       invoices = @client.Invoice.all
-      
+
       assert_equal(Time.parse("2008-9-16T10:28:51.5Z"), invoices[0].updated_date_utc)
 
       invoices.each do |invoice|

data/test/unit/models/journal_line_test.rb

@@ -1,20 +1,20 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'test_helper'))
+require 'unit_test_helper'
 
 class JournalLineTest < Test::Unit::TestCase
   include TestHelper
   include Xeroizer::Record
-  
+
   def setup
-    @client = Xeroizer::PublicApplication.new(CONSUMER_KEY, CONSUMER_SECRET)
+    @client = Xeroizer::OAuth2Application.new(CLIENT_ID, CLIENT_SECRET)
   end
-  
+
   it "journal_line tracking specified correctly" do
     journal = @client.Journal.build
     journal_line = journal.add_journal_line({})
-    
+
     journal_line.add_tracking_category(:name => "Name 1", :option => "Option 1")
     journal_line.add_tracking_category(:name => "Name 2", :option => "Option 2")
-    
+
     doc = Nokogiri::XML(journal_line.to_xml)
     assert_equal 2, doc.xpath("/JournalLine/TrackingCategories/TrackingCategory").size
   end

data/test/unit/models/journal_test.rb

@@ -1,11 +1,11 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'test_helper'))
+require 'unit_test_helper'
 
 class JournalTest < Test::Unit::TestCase
   include TestHelper
   include Xeroizer::Record
-  
+
   def setup
-    @client = Xeroizer::PublicApplication.new(CONSUMER_KEY, CONSUMER_SECRET)
+    @client = Xeroizer::OAuth2Application.new(CLIENT_ID, CLIENT_SECRET)
 
     @journal = @client.Journal.build
     @journal.journal_id = "0d926df3-459f-4264-a3a3-49ac065eb0ed"
@@ -39,6 +39,6 @@ class JournalTest < Test::Unit::TestCase
     it "should render date" do
       assert_equal "2015-01-01", @doc.xpath("//JournalDate").text
     end
-  end 
+  end
 
 end

data/test/unit/models/line_item_sum_test.rb

@@ -1,4 +1,4 @@
-require "test_helper"
+require 'unit_test_helper'
 
 class LineItemSumTest < Test::Unit::TestCase
   include Xeroizer::Record

data/test/unit/models/line_item_test.rb

@@ -1,11 +1,11 @@
-require "test_helper"
+require 'unit_test_helper'
 
 class LineItemTest < Test::Unit::TestCase
   include TestHelper
   include Xeroizer::Record
 
   def setup
-    @client = Xeroizer::PublicApplication.new(CONSUMER_KEY, CONSUMER_SECRET)
+    @client = Xeroizer::OAuth2Application.new(CLIENT_ID, CLIENT_SECRET)
   end
 
   it "line_item tracking specified correctly" do
@@ -56,4 +56,21 @@ class LineItemTest < Test::Unit::TestCase
     assert_equal 50, line_item.line_amount,
                  "expected line amount to be calculated from coerced values"
   end
+
+  context "line_item validations" do
+
+    it "is an invalid line_item if there is no description" do
+      line_item = LineItem.new(nil)
+
+      assert_equal(false, line_item.valid?)
+    end
+
+    it "is a valid line_item with minimal attributes" do
+      line_item = LineItem.new(nil)
+      line_item.description = "Test Description"
+
+      assert_equal(true, line_item.valid?)
+    end
+
+  end
 end

data/test/unit/models/manual_journal_test.rb

@@ -1,10 +1,10 @@
-require 'test_helper'
+require 'unit_test_helper'
 
 class ManualJournalTest < Test::Unit::TestCase
   include TestHelper
 
   def setup
-    @client = Xeroizer::PublicApplication.new(CONSUMER_KEY, CONSUMER_SECRET)
+    @client = Xeroizer::OAuth2Application.new(CLIENT_ID, CLIENT_SECRET)
     mock_api('ManualJournals')
   end
 
@@ -22,4 +22,4 @@ class ManualJournalTest < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/unit/models/organisation_test.rb

@@ -1,10 +1,10 @@
-require 'test_helper'
+require 'unit_test_helper'
 
 class OrganisationTest < Test::Unit::TestCase
   include TestHelper
 
   def setup
-    @client = Xeroizer::PublicApplication.new(CONSUMER_KEY, CONSUMER_SECRET)
+    @client = Xeroizer::OAuth2Application.new(CLIENT_ID, CLIENT_SECRET)
   end
 
   context "sales_tax_basis_validations" do

data/test/unit/models/payment_service_test.rb

@@ -1,10 +1,10 @@
-require 'test_helper'
+require 'unit_test_helper'
 
 class PaymentServiceTest < Test::Unit::TestCase
   include TestHelper
 
   def setup
-    @client = Xeroizer::PublicApplication.new(CONSUMER_KEY, CONSUMER_SECRET)
+    @client = Xeroizer::OAuth2Application.new(CLIENT_ID, CLIENT_SECRET)
   end
 
   context "response parsing" do

data/test/unit/models/phone_test.rb

@@ -1,23 +1,23 @@
-require 'test_helper'
+require 'unit_test_helper'
 
 class PhoneTest < Test::Unit::TestCase
   include TestHelper
-  
+
   def setup
-    @client = Xeroizer::PublicApplication.new(CONSUMER_KEY, CONSUMER_SECRET)
+    @client = Xeroizer::OAuth2Application.new(CLIENT_ID, CLIENT_SECRET)
     @contact = @client.Contact.build
 
   end
-  
+
   context "validators" do
-    
+
     should "not allow long phone numbers" do
       @phone = @contact.add_phone(phone_number: "1234567890123456789012345678901234567890123456789012345678901234567890")
       assert_equal(false, @phone.valid?)
       blank_error = @phone.errors_for(:phone_number).first
       assert_not_nil(blank_error)
       assert_equal("must be shorter than 50 characters", blank_error)
-      
+
     end
 
     should "allow phone numbers" do
@@ -27,5 +27,5 @@ class PhoneTest < Test::Unit::TestCase
       assert_equal(0, @phone.errors.size)
     end
   end
-  
+
 end

data/test/unit/models/prepayment_test.rb

@@ -1,14 +1,14 @@
-require 'test_helper'
+require 'unit_test_helper'
 
 class PrepaymentTest < Test::Unit::TestCase
   include TestHelper
-  
+
   def setup
-    @client = Xeroizer::PublicApplication.new(CONSUMER_KEY, CONSUMER_SECRET)    
+    @client = Xeroizer::OAuth2Application.new(CLIENT_ID, CLIENT_SECRET)
     mock_api("Prepayments")
     @prepayment = @client.Prepayment.first
   end
-  
+
   context "prepayment attributes" do
     should "large-scale testing from API XML" do
       prepayments = @client.Prepayment.all

data/test/unit/models/repeating_invoice_test.rb

@@ -1,10 +1,10 @@
-require 'test_helper'
+require 'unit_test_helper'
 
 class RepeatingInvoiceTest < Test::Unit::TestCase
   include TestHelper
 
   def setup
-    @client = Xeroizer::PublicApplication.new(CONSUMER_KEY, CONSUMER_SECRET)
+    @client = Xeroizer::OAuth2Application.new(CLIENT_ID, CLIENT_SECRET)
     mock_api('RepeatingInvoices')
   end
 

data/test/unit/models/tax_rate_test.rb

@@ -1,11 +1,11 @@
-require 'test_helper'
+require 'unit_test_helper'
 require 'mocha/test_unit'
 
 class TaxRateTest < Test::Unit::TestCase
   include TestHelper
 
   def setup
-    @client = Xeroizer::PublicApplication.new(CONSUMER_KEY, CONSUMER_SECRET)
+    @client = Xeroizer::OAuth2Application.new(CLIENT_ID, CLIENT_SECRET)
   end
 
   should "have a primary key value of :name" do

data/test/unit/oauth2_test.rb

@@ -0,0 +1,171 @@
+require 'unit_test_helper'
+
+class OAuth2Test < UnitTestCase
+  include TestHelper
+
+  setup do
+    @client_id = 'client_id'
+    @client_secret = 'client_secret'
+    @access_token = 'access_token'
+    @site = 'https://example.com'
+    @content_type = 'application/xml'
+    @path = '/path'
+    @uri = "#{@site}#{@path}"
+    @response_body = '{"test": true}'
+    @status_code = 200
+    @additional_headers = {foo: 'bar'}
+    @request_body = "xml"
+    @request_headers = { 'Content-Type' => @content_type }
+    @tenant_id = "tenant"
+  end
+
+  def instance
+    Xeroizer::OAuth2.new(@client_id, @client_secret, {
+        site: @site
+    }).tap do |oauth2|
+      oauth2.authorize_from_access(@access_token)
+    end
+  end
+
+  context "get" do
+    setup do
+      stub_request(:get, @uri).
+          with(
+              headers: {
+                  'Authorization' => "Bearer #{@access_token}",
+              }
+          ).to_return(status: @status_code, body: @response_body, headers: {})
+    end
+
+    context "when tenant_id is not present" do
+      should "make a get request" do
+        result = instance.get(@path)
+        assert_equal(result.code, @status_code)
+        assert_equal(result.plain_body, @response_body)
+        assert_requested :get, @uri
+        assert_not_requested :get, @uri, headers: { "Xero-tenant-id" => @tenant_id }
+      end
+    end
+
+    context "when tenant_id is present" do
+      setup do
+        @client = instance
+        @client.tenant_id = @tenant_id
+      end
+
+      should "make a get request with the tenant_id" do
+        result = @client.get(@path)
+        assert_equal(result.code, @status_code)
+        assert_equal(result.plain_body, @response_body)
+        assert_requested :get, @uri, headers: { "Xero-tenant-id" => @tenant_id }
+      end
+    end
+  end
+
+  context "delete" do
+    setup do
+      stub_request(:delete, @uri).
+          with(
+              headers: {
+                  'Authorization' => "Bearer #{@access_token}",
+              }
+          ).to_return(status: @status_code, body: @response_body, headers: {})
+    end
+
+    context "when tenant_id is not present" do
+      should "make a delete request" do
+        result = instance.delete(@path)
+        assert_equal(result.code, @status_code)
+        assert_not_requested :delete, @uri, headers: { "Xero-tenant-id" => @tenant_id }
+      end
+    end
+
+
+    context "when tenant_id is present" do
+      setup do
+        @client = instance
+        @client.tenant_id = @tenant_id
+      end
+
+      should "make a delete request with the tenant_id" do
+        result = @client.delete(@path)
+        assert_equal(result.code, @status_code)
+        assert_equal(result.plain_body, @response_body)
+        assert_requested :delete, @uri, headers: { "Xero-tenant-id" => @tenant_id }
+      end
+    end
+  end
+
+  context "post" do
+    setup do
+      stub_request(:post, @uri).
+          with(
+              body: @request_body,
+              headers: {
+                  'Authorization' => "Bearer #{@access_token}",
+                  'Content-Type' => @content_type,
+              }).
+          to_return(status: @status_code, body: @response_body, headers: @request_headers)
+
+    end
+
+    context "when tenant_id is not present" do
+      should "make a post request" do
+        result = instance.post(@path, @request_body, @request_headers)
+        assert_equal(result.code, @status_code)
+        assert_equal(result.plain_body, @response_body)
+        assert_not_requested :post, @uri, headers: { "Xero-tenant-id" => @tenant_id }
+      end
+    end
+
+    context "when tenant_id is present" do
+      setup do
+        @client = instance
+        @client.tenant_id = @tenant_id
+      end
+
+      should "make a post request with the tenant_id" do
+        result = @client.post(@path, @request_body, @request_headers)
+        assert_equal(result.code, @status_code)
+        assert_equal(result.plain_body, @response_body)
+        assert_requested :post, @uri, headers: { "Xero-tenant-id" => @tenant_id }
+      end
+    end
+  end
+
+  context "put" do
+    setup do
+      stub_request(:put, @uri).
+          with(
+              body: @request_body,
+              headers: {
+                  'Authorization' => "Bearer #{@access_token}",
+                  'Content-Type' => @content_type,
+              }).
+          to_return(status: @status_code, body: @response_body, headers: @request_headers)
+    end
+
+    context "when tenant_id is not present" do
+      should "make a put request" do
+        result = instance.put(@path, @request_body, @request_headers)
+        assert_equal(result.code, @status_code)
+        assert_equal(result.plain_body, @response_body)
+        assert_not_requested :put, @uri, headers: { "Xero-tenant-id" => @tenant_id }
+      end
+    end
+
+    context "when tenant_id is present" do
+      setup do
+        @client = instance
+        @client.tenant_id = @tenant_id
+      end
+
+      should "make a put request" do
+        result = @client.put(@path, @request_body, @request_headers)
+        assert_equal(result.code, @status_code)
+        assert_equal(result.plain_body, @response_body)
+        assert_requested :put, @uri, headers: { "Xero-tenant-id" => @tenant_id }
+      end
+    end
+  end
+end

data/test/unit/oauth_config_test.rb

@@ -1,4 +1,4 @@
-require "test_helper"
+require 'unit_test_helper'
 
 class OAuthConfigTest < Test::Unit::TestCase
   include Xeroizer

data/test/unit/record/base_model_test.rb

@@ -1,50 +1,50 @@
-require 'test_helper'
+require 'unit_test_helper'
 
 class RecordBaseModelTest < Test::Unit::TestCase
   include TestHelper
-  
+
   class AppleModel < Xeroizer::Record::BaseModel
     set_api_controller_name 'AppleController'
     set_permissions :read, :write
   end
-  
+
   class PearModel < Xeroizer::Record::BaseModel
     set_api_controller_name 'PearController'
     set_permissions :read
   end
-  
+
   class OrangeModel < Xeroizer::Record::BaseModel
     set_permissions :read, :write, :update
   end
-  
+
   def setup
-    @client = Xeroizer::PublicApplication.new(CONSUMER_KEY, CONSUMER_SECRET)
+    @client = Xeroizer::OAuth2Application.new(CLIENT_ID, CLIENT_SECRET)
     @apple_model = AppleModel.new(@client, 'Apple')
     @pear_model = PearModel.new(@client, 'Pear')
     @orange_model = OrangeModel.new(@client, 'Orange')
   end
-  
+
   context "RecordModel.api_controller_name" do
-    
+
     should "api_controller_name should default to pluralized model name" do
       assert_equal('Oranges', @orange_model.api_controller_name)
     end
-    
+
     should "set_api_controller_name should set the base controller name used by Xero" do
       assert_equal('AppleController', @apple_model.api_controller_name)
      assert_equal('PearController', @pear_model.api_controller_name)
     end
-    
+
   end
-  
+
   context "model permssions" do
-    
+
     should "save permissions correctly" do
       assert_equal(%w(read write), @apple_model.class.permissions.keys.map(&:to_s).sort)
       assert_equal(%w(read), @pear_model.class.permissions.keys.map(&:to_s).sort)
       assert_equal(%w(read update write), @orange_model.class.permissions.keys.map(&:to_s).sort)
     end
-    
+
   end
 
   context "InvalidPermissionError" do

data/test/unit/record/base_test.rb

@@ -1,10 +1,11 @@
-require 'test_helper'
+require 'unit_test_helper'
 
 class RecordBaseTest < Test::Unit::TestCase
   include TestHelper
 
   def setup
-    @client = Xeroizer::PublicApplication.new(CONSUMER_KEY, CONSUMER_SECRET)
+    @client = Xeroizer::OAuth2Application.new(CLIENT_ID, CLIENT_SECRET, tenant_id: TENANT_ID)
+    @client.authorize_from_access(ACCESS_TOKEN)
     @contact = @client.Contact.build(:name => 'Test Contact Name ABC')
   end
 
@@ -26,14 +27,14 @@ class RecordBaseTest < Test::Unit::TestCase
   context "new_record? states" do
 
     should "new_record? should be false when loading data" do
-      Xeroizer::OAuth.any_instance.stubs(:get).returns(stub(:plain_body => get_record_xml(:contact), :code => '200'))
+      Xeroizer::OAuth2.any_instance.stubs(:get).returns(stub(:plain_body => get_record_xml(:contact), :code => '200'))
       contact = @client.Contact.find('TESTID')
       assert_kind_of(Xeroizer::Record::Contact, contact)
       assert_equal(false, contact.new_record?)
     end
 
     should "new_record? should be false after successfully creating a record" do
-      Xeroizer::OAuth.any_instance.stubs(:put).returns(stub(:plain_body => get_record_xml(:contact), :code => '200'))
+      Xeroizer::OAuth2.any_instance.stubs(:put).returns(stub(:plain_body => get_record_xml(:contact), :code => '200'))
       assert_equal(true, @contact.new_record?)
       assert_nil(@contact.contact_id)
       assert_equal(true, @contact.save, "Error saving contact: #{@contact.errors.inspect}")

data/test/unit/record/block_validator_test.rb

@@ -1,4 +1,4 @@
-require "test_helper"
+require 'unit_test_helper'
 
 class BlockValidatorTest < Test::Unit::TestCase
   def setup