xeroizer 2.18.1 → 3.0.1

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
@@ -26,7 +26,7 @@ class LineItemTest < Test::Unit::TestCase
     line_item.unit_amount = BigDecimal("1337.00")
 
     assert_equal "1337.0", line_item.line_amount.to_s,
-      "expected line_amount to equal unit_amount times quantity"
+                 "expected line_amount to equal unit_amount times quantity"
   end
 
   it "line_amount equals unit_amount times quantity minus the discount if there is a discount_rate" do
@@ -36,43 +36,41 @@ class LineItemTest < Test::Unit::TestCase
     line_item.discount_rate = BigDecimal("12.34")
 
     assert_equal "1172.01", line_item.line_amount.to_s,
-      "expected line_amount to equal unit_amount times quantity minus the discount"
+                 "expected line_amount to equal unit_amount times quantity minus the discount"
   end
 
-  it "line_amount is zero when quantity is nil or zero" do
+  it "line_amount equals unit_amount times quantity minus the discount if there is a discount_amount" do
     line_item = LineItem.new(nil)
+    line_item.quantity = 1
+    line_item.unit_amount = BigDecimal("1337.00")
+    line_item.discount_amount = BigDecimal("164.99")
 
-    line_item.quantity = nil
-    line_item.unit_amount = BigDecimal("1.00")
-
-    assert_equal "0.0", line_item.line_amount.to_s,
-      "expected line amount to be zero when quantity is nil"
-
-    line_item.quantity = 0
-    assert_equal "0.0", line_item.line_amount.to_s,
-      "expected line amount to be zero when quantity is zero"
+    assert_equal "1172.01", line_item.line_amount.to_s,
+                 "expected line_amount to equal unit_amount times quantity minus the discount amount"
   end
 
-  it "is not possible to set unit_amount to zero" do
+  it "coerces decimals when calculating line amount" do
     line_item = LineItem.new(nil)
+    line_item.quantity = "1"
+    line_item.unit_amount = 50
+    assert_equal 50, line_item.line_amount,
+                 "expected line amount to be calculated from coerced values"
+  end
 
-    line_item.unit_amount = nil
+  context "line_item validations" do
 
-    assert_equal 0.0, line_item.unit_amount,
-      "Expected setting unit_amount to nil to be ignored, i.e., it should remain zero"
-  end
+    it "is an invalid line_item if there is no description" do
+      line_item = LineItem.new(nil)
 
-  it "line_amount is zero when unit_amount is nil or zero" do
-    line_item = LineItem.new(nil)
+      assert_equal(false, line_item.valid?)
+    end
 
-    line_item.quantity = 1
-    line_item.unit_amount = nil
+    it "is a valid line_item with minimal attributes" do
+      line_item = LineItem.new(nil)
+      line_item.description = "Test Description"
 
-    assert_equal "0.0", line_item.line_amount.to_s,
-      "expected line amount to be zero when unit_amount is nil"
+      assert_equal(true, line_item.valid?)
+    end
 
-    line_item.unit_amount = BigDecimal("0.00")
-    assert_equal "0.0", line_item.line_amount.to_s,
-      "expected line amount to be zero when unit_amount is zero"
   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
@@ -35,4 +35,18 @@ class OrganisationTest < Test::Unit::TestCase
     end
   end
 
+  context "parse response" do
+    it "includes payment_terms" do
+      @instance = Xeroizer::Record::OrganisationModel.new(nil, "Organisation")
+      some_xml = get_record_xml("organisations")
+
+      result = @instance.parse_response(some_xml)
+      organisation = result.response_items.first
+
+      assert_equal(organisation.payment_terms.bills.day, "4")
+      assert_equal(organisation.payment_terms.bills.type, "OFFOLLOWINGMONTH")
+      assert_equal(organisation.payment_terms.sales.day, "2")
+      assert_equal(organisation.payment_terms.sales.type, "OFFOLLOWINGMONTH")
+    end
+  end
 end

data/test/unit/models/payment_service_test.rb

@@ -0,0 +1,29 @@
+require 'unit_test_helper'
+
+class PaymentServiceTest < Test::Unit::TestCase
+  include TestHelper
+
+  def setup
+    @client = Xeroizer::OAuth2Application.new(CLIENT_ID, CLIENT_SECRET)
+  end
+
+  context "response parsing" do
+    it "parses default attributes" do
+      @instance = Xeroizer::Record::PaymentServiceModel.new(nil, "PaymentService")
+
+      some_xml = get_record_xml("payment_service")
+
+      result = @instance.parse_response(some_xml)
+      payment_service = result.response_items.first
+
+      keys = [:payment_service_id,
+              :payment_service_name,
+              :payment_service_type,
+              :payment_service_url,
+              :pay_now_text
+      ]
+
+      assert_equal(payment_service.attributes.keys, keys)
+    end
+  end
+end

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
 
@@ -18,7 +18,7 @@ class RepeatingInvoiceTest < Test::Unit::TestCase
       repeating_invoice = repeating_invoices.first
 
       assert_equal "PowerDirect", repeating_invoice.contact_name
-      assert_equal BigDecimal.new(90), repeating_invoice.total
+      assert_equal BigDecimal(90), repeating_invoice.total
       assert_equal true, repeating_invoice.accounts_payable?
 
       schedule = repeating_invoice.schedule

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