fortnox-api 0.7.2 → 0.8.1

data/spec/fortnox/api/repositories/article_spec.rb

@@ -27,12 +27,12 @@ describe Fortnox::API::Repository::Article, order: :defined, integration: true d
                    '5901234123457'
 
   # When recording new VCR cassettes, expected matches must be increased
-  include_examples '.all', 26
+  include_examples '.all', 33
 
   # When recording new VCR cassettes, expected matches must be increased
   include_examples '.find', '1' do
     let(:find_by_hash_failure) { { description: 'Not Found' } }
-    let(:single_param_find_by_hash) { { find_hash: { articlenumber: 1 }, matches: 13 } }
+    let(:single_param_find_by_hash) { { find_hash: { articlenumber: 1 }, matches: 14 } }
 
     let(:multi_param_find_by_hash) do
       { find_hash: { articlenumber: 1, description: 'Cykelpump' }, matches: 1 }

data/spec/fortnox/api/repositories/base_spec.rb

@@ -4,19 +4,11 @@ require 'spec_helper'
 require 'fortnox/api'
 
 describe Fortnox::API::Repository::Base do
-  using_test_class do
-    module Model
-      class RepositoryBaseTest
-      end
-    end
-    module Repository
-      class Test < Fortnox::API::Repository::Base
-        MODEL = Model::RepositoryBaseTest
-      end
-    end
-  end
-
   before do
+    stub_const('Model::RepositoryBaseTest', Class.new)
+    stub_const('Repository::Test', Class.new(described_class))
+    stub_const('Repository::Test::MODEL', Model::RepositoryBaseTest)
+
     Fortnox::API::Registry.register(:repositorybasetest, Model::RepositoryBaseTest)
   end
 

data/spec/fortnox/api/repositories/customer_spec.rb

@@ -39,7 +39,7 @@ describe Fortnox::API::Repository::Customer, order: :defined, integration: true
   end
 
   # When recording new VCR casettes, expected matches must be increased
-  include_examples '.search', :name, 'Test', 30
+  include_examples '.search', :name, 'Test', 33
 
   describe 'country reference' do
     describe 'with valid country code \'SE\'' do

data/spec/fortnox/api/repositories/invoice_spec.rb

@@ -37,7 +37,7 @@ describe Fortnox::API::Repository::Invoice, order: :defined, integration: true d
 
   # It is not possible to delete Invoces. Therefore, expected nr of Orders
   # when running .all will continue to increase (until 100, which is max by default).
-  include_examples '.all', 97
+  include_examples '.all', 100
 
   include_examples '.find', 1 do
     let(:find_by_hash_failure) { { yourreference: 'Not found' } }
@@ -89,12 +89,6 @@ describe Fortnox::API::Repository::Invoice, order: :defined, integration: true d
         it { is_expected.to eq('GB') }
       end
 
-      describe 'KR' do
-        subject { save_invoice(country: 'KR').country }
-
-        it { is_expected.to eq('KR') }
-      end
-
       describe 'VA' do
         subject { save_invoice(country: 'VA').country }
 
@@ -129,27 +123,27 @@ describe Fortnox::API::Repository::Invoice, order: :defined, integration: true d
 
       before { persisted_invoice }
 
-      context 'by setting value to nil' do
+      context 'when setting value to nil' do
+        subject { updated_persisted_invoice.comments }
+
         let(:updated_persisted_invoice) do
           VCR.use_cassette("#{vcr_dir}/save_old_with_nil_comments") do
             repository.save(persisted_invoice.update(comments: nil))
           end
         end
 
-        subject { updated_persisted_invoice.comments }
-
         pending { is_expected.to eq(nil) }
       end
 
-      context 'by setting value to empty string' do
+      context 'when setting value to empty string' do
+        subject { updated_persisted_invoice.comments }
+
         let(:updated_persisted_invoice) do
           VCR.use_cassette("#{vcr_dir}/save_old_with_empty_comments") do
             repository.save(persisted_invoice.update(comments: ''))
           end
         end
 
-        subject { updated_persisted_invoice.comments }
-
         it 'does not reset the value' do
           is_expected.to eq('A comment to be reset')
         end
@@ -169,7 +163,9 @@ describe Fortnox::API::Repository::Invoice, order: :defined, integration: true d
 
       before { persisted_invoice }
 
-      context 'by setting value to nil' do
+      context 'when setting value to nil' do
+        subject { updated_persisted_invoice.country }
+
         let(:updated_persisted_invoice) do
           # TODO: This VCR cassette needs to be re-recorded again
           # when the we fix #172.
@@ -178,20 +174,18 @@ describe Fortnox::API::Repository::Invoice, order: :defined, integration: true d
           end
         end
 
-        subject { updated_persisted_invoice.country }
-
         pending { is_expected.to eq(nil) }
       end
 
-      context 'by setting value to empty string' do
+      context 'when setting value to empty string' do
+        subject { updated_persisted_invoice.country }
+
         let(:updated_persisted_invoice) do
           VCR.use_cassette("#{vcr_dir}/save_old_with_empty_country") do
             repository.save(persisted_invoice.update(country: ''))
           end
         end
 
-        subject { updated_persisted_invoice.country }
-
         it 'does not reset the country' do
           is_expected.to eq('SE')
         end

data/spec/fortnox/api/repositories/project_spec.rb

@@ -22,7 +22,7 @@ describe Fortnox::API::Repository::Project, order: :defined, integration: true d
   # It is not yet possible to delete Projects. Therefore, expected nr of
   # Projects when running .all will continue to increase
   # (until 100, which is max by default).
-  include_examples '.all', 31
+  include_examples '.all', 37
 
   include_examples '.find', '1' do
     let(:find_by_hash_failure) { { offset: 10_000 } }

data/spec/fortnox/api/repositories/terms_of_payment_spec.rb

@@ -18,12 +18,12 @@ describe Fortnox::API::Repository::TermsOfPayment, order: :defined, integration:
   before { set_api_test_configuration }
 
   # When recording new VCR cassettes, code must be changed to a new unique one
-  required_hash = { code: '18DAYS' }
+  required_hash = { code: '20DAYS' }
 
   include_examples '.save', :description, additional_attrs: required_hash
 
   # When recording new VCR cassettes, expected matches needs to be increased
-  include_examples '.all', 12
+  include_examples '.all', 14
 
   include_examples '.find', '15DAYS', find_by_hash: false do
     let(:find_by_hash_failure) { { code: '15days' } }

data/spec/fortnox/api/repositories/unit_spec.rb

@@ -19,16 +19,16 @@ describe Fortnox::API::Repository::Unit, order: :defined, integration: true do
   # When recording new VCR cassettes, code needs to be changed to a unique value
   include_examples '.save',
                    :description,
-                   additional_attrs: { code: 'blarg4' }
+                   additional_attrs: { code: 'blarg7' }
 
   # When recording new VCR cassettes, code needs to be changed to a unique value
   include_examples '.save with specially named attribute',
                    { description: 'Happy clouds' },
                    :code,
-                   'woooh4'
+                   'woooh6'
 
   # When recording new VCR cassettes, expected number must be updated
-  include_examples '.all', 12
+  include_examples '.all', 16
 
   include_examples '.find', 'blarg', find_by_hash: false do
     let(:find_by_hash_failure) { { code: 'notfound' } }

data/spec/fortnox/api/types/enums_spec.rb

@@ -13,4 +13,5 @@ describe Fortnox::API::Types do
   it_behaves_like 'enum', 'VATType', 'VATTypes'
   it_behaves_like 'enum', 'DefaultDeliveryType', 'DefaultDeliveryTypeValues'
   it_behaves_like 'enum', 'ProjectStatusType', 'ProjectStatusTypes'
+  it_behaves_like 'enum', 'TaxReductionType', 'TaxReductionTypes'
 end

data/spec/fortnox/api/types/housework_types_spec.rb

@@ -14,29 +14,32 @@ describe 'HouseworkTypes', integration: true do
   before { set_api_test_configuration }
 
   let(:repository) { Fortnox::API::Repository::Order.new }
-  let(:valid_model) do
-    Fortnox::API::Model::Order.new(customer_number: '1', order_rows: [order_row])
-  end
-  let(:order_row) do
-    Fortnox::API::Types::OrderRow.new(ordered_quantity: 1,
-                                      article_number: '0000',
-                                      housework_type: housework_type)
-  end
 
-  shared_examples_for 'housework type' do |type, legacy: false|
+  shared_examples_for 'housework type' do |type, tax_reduction_type, legacy: false, housework: true|
     subject do
-      lambda do
-        VCR.use_cassette("orders/housework_type_#{type.downcase}") do
-          repository.save(valid_model)
-        end
-      end
+      cassette = "orders/housework_type_#{type.downcase}"
+      -> { VCR.use_cassette(cassette) { repository.save(document) } }
     end
 
-    let(:error_message) { 'Skattereduktion för den valda typen av husarbete har upphört.' }
-    let(:housework_type) { Fortnox::API::Types::HouseworkTypes[type] }
+    let(:document) do
+      Fortnox::API::Model::Order.new(
+        customer_number: '1',
+        tax_reduction_type: tax_reduction_type,
+        order_rows: [
+          Fortnox::API::Types::OrderRow.new(
+            ordered_quantity: 1,
+            article_number: '0000',
+            housework_type: Fortnox::API::Types::HouseworkTypes[type],
+            housework: housework
+          )
+        ]
+      )
+    end
 
     context "when creating an OrderRow with housework_type set to #{type}" do
       if legacy
+        let(:error_message) { 'Skattereduktion för den valda typen av husarbete har upphört.' }
+
         it 'raises an error' do
           is_expected.to raise_error(Fortnox::API::RemoteServerError, error_message)
         end
@@ -46,23 +49,108 @@ describe 'HouseworkTypes', integration: true do
     end
   end
 
-  it_behaves_like 'housework type', 'CONSTRUCTION'
-  it_behaves_like 'housework type', 'ELECTRICITY'
-  it_behaves_like 'housework type', 'GLASSMETALWORK'
-  it_behaves_like 'housework type', 'GROUNDDRAINAGEWORK'
-  it_behaves_like 'housework type', 'MASONRY'
-  it_behaves_like 'housework type', 'PAINTINGWALLPAPERING'
-  it_behaves_like 'housework type', 'HVAC'
-  it_behaves_like 'housework type', 'CLEANING'
-  it_behaves_like 'housework type', 'TEXTILECLOTHING'
-  it_behaves_like 'housework type', 'CLEANING'
-  it_behaves_like 'housework type', 'SNOWPLOWING'
-  it_behaves_like 'housework type', 'GARDENING'
-  it_behaves_like 'housework type', 'BABYSITTING'
-  it_behaves_like 'housework type', 'OTHERCARE'
-  it_behaves_like 'housework type', 'OTHERCOSTS'
-
-  it_behaves_like 'housework type', 'COOKING', legacy: true
-  it_behaves_like 'housework type', 'TUTORING', legacy: true
+  TYPE_ROT = Fortnox::API::Types::TaxReductionTypes['rot']
+  TYPE_RUT = Fortnox::API::Types::TaxReductionTypes['rut']
+
+  it_behaves_like 'housework type', 'CONSTRUCTION', TYPE_ROT
+  it_behaves_like 'housework type', 'ELECTRICITY', TYPE_ROT
+  it_behaves_like 'housework type', 'GLASSMETALWORK', TYPE_ROT
+  it_behaves_like 'housework type', 'GROUNDDRAINAGEWORK', TYPE_ROT
+  it_behaves_like 'housework type', 'MASONRY', TYPE_ROT
+  it_behaves_like 'housework type', 'PAINTINGWALLPAPERING', TYPE_ROT
+  it_behaves_like 'housework type', 'HVAC', TYPE_ROT
+  it_behaves_like 'housework type', 'OTHERCOSTS', TYPE_ROT, housework: false
+
+  it_behaves_like 'housework type', 'MAJORAPPLIANCEREPAIR', TYPE_RUT
+  it_behaves_like 'housework type', 'MOVINGSERVICES', TYPE_RUT
+  it_behaves_like 'housework type', 'ITSERVICES', TYPE_RUT
+  it_behaves_like 'housework type', 'CLEANING', TYPE_RUT
+  it_behaves_like 'housework type', 'TEXTILECLOTHING', TYPE_RUT
+  it_behaves_like 'housework type', 'SNOWPLOWING', TYPE_RUT
+  it_behaves_like 'housework type', 'GARDENING', TYPE_RUT
+  it_behaves_like 'housework type', 'BABYSITTING', TYPE_RUT
+  it_behaves_like 'housework type', 'OTHERCARE', TYPE_RUT
+  it_behaves_like 'housework type', 'OTHERCOSTS', TYPE_RUT, housework: false
+
+  # rubocop:disable RSpec/RepeatedDescription
+  pending 'to be added' do
+    raise Exception, 'Will be supported 2021-01-01'
+    # it_behaves_like 'housework type', 'HOMEMAINTENANCE', TYPE_RUT
+    # it_behaves_like 'housework type', 'FURNISHING', TYPE_RUT
+    # it_behaves_like 'housework type', 'TRANSPORTATIONSERVICES', TYPE_RUT
+    # it_behaves_like 'housework type', 'WASHINGANDCAREOFCLOTHING', TYPE_RUT
+  end
+
+  pending 'to be added' do
+    raise Exception, 'Will be supported 2021-01-01'
+    # it_behaves_like 'housework type', 'SOLARCELLS', TYPE_GREEN
+    # it_behaves_like 'housework type', 'STORAGESELFPRODUCEDELECTRICTY', TYPE_GREEN
+    # it_behaves_like 'housework type', 'CHARGINGSTATIONELECTRICVEHICLE', TYPE_GREEN
+    # it_behaves_like 'housework type', 'OTHERCOSTS', TYPE_GREEN
+  end
+  # rubocop:enable RSpec/RepeatedDescription
+
+  it_behaves_like 'housework type', 'COOKING', TYPE_RUT, legacy: true
+  it_behaves_like 'housework type', 'TUTORING', TYPE_RUT, legacy: true
+
+  describe 'with OTHERCOSTS' do
+    subject do
+      cassette = 'orders/housework_othercoses_invalid'
+      -> { VCR.use_cassette(cassette) { repository.save(document) } }
+    end
+
+    let(:document) do
+      Fortnox::API::Model::Order.new(
+        customer_number: '1',
+        tax_reduction_type: TYPE_ROT,
+        order_rows: [
+          Fortnox::API::Types::OrderRow.new(
+            ordered_quantity: 1,
+            article_number: '0000',
+            housework_type: Fortnox::API::Types::HouseworkTypes['OTHERCOSTS'],
+            housework: true
+          )
+        ]
+      )
+    end
+
+    let(:error_message) { 'Kan inte sätta typen övrig kostnad på en rad markerad som husarbete.' }
+
+    it "can't have housework set to true" do
+      is_expected.to raise_error(Fortnox::API::RemoteServerError, error_message)
+    end
+  end
+
+  describe 'with wrong tax reduction type' do
+    subject do
+      cassette = 'orders/housework_invalid_tax_reduction_type'
+      -> { VCR.use_cassette(cassette) { repository.save(document) } }
+    end
+
+    let(:type) { 'CONSTRUCTION' }
+    let(:document) do
+      Fortnox::API::Model::Order.new(
+        customer_number: '1',
+        tax_reduction_type: TYPE_RUT,
+        order_rows: [
+          Fortnox::API::Types::OrderRow.new(
+            ordered_quantity: 1,
+            article_number: '0000',
+            housework_type: Fortnox::API::Types::HouseworkTypes[type],
+            housework: true
+          )
+        ]
+      )
+    end
+
+    let(:error_message) do
+      "Dokument med skattereduktionstypen '#{TYPE_RUT}' " \
+      "får inte innehålla rader med husarbetestypen '#{type}'."
+    end
+
+    it 'raises an error' do
+      is_expected.to raise_error(Fortnox::API::RemoteServerError, error_message)
+    end
+  end
 end
 # rubocop:enable RSpec/DescribeClass

data/spec/fortnox/api/types/model_spec.rb

@@ -6,16 +6,14 @@ require 'fortnox/api/types/model'
 
 RSpec.describe Fortnox::API::Types::Model do
   shared_examples_for 'raises error' do |error|
-    using_test_classes do
-      module Types
-        include Dry::Types.module
+    before do
+      stub_const('Types::Age', Dry::Types['strict.integer'].constrained(gt: 18).is(:required))
 
-        Age = Int.constrained(gt: 18).is(:required)
-      end
-
-      class TypesModelUser < Fortnox::API::Types::Model
+      types_model_user_class = Class.new(Fortnox::API::Types::Model) do
         attribute :age, Types::Age
       end
+
+      stub_const('TypesModelUser', types_model_user_class)
     end
 
     describe "User inheriting from #{described_class}" do
@@ -32,21 +30,17 @@ RSpec.describe Fortnox::API::Types::Model do
   end
 
   context 'when omitting optional keys' do
-    using_test_class do
-      module Types
-        include Dry::Types.module
+    subject { -> { User.new } }
 
-        module Nullable
-          String = Types::Strict::String.optional
-        end
-      end
+    before do
+      stub_const('Types::Nullable::String', Dry::Types['strict.string'].optional)
 
-      class User < Fortnox::API::Types::Model
+      user_class = Class.new(Fortnox::API::Types::Model) do
         attribute :optional_string, Types::Nullable::String
       end
-    end
 
-    subject { -> { User.new } }
+      stub_const('User', user_class)
+    end
 
     it { is_expected.not_to raise_error }
 

data/spec/fortnox/api/types/nullable_spec.rb

@@ -8,52 +8,72 @@ describe Fortnox::API::Types::Nullable, type: :type do
   subject { TestStruct }
 
   describe 'String' do
-    using_test_class do
-      class TestStruct < Dry::Struct
+    before do
+      test_struct_class = Class.new(Dry::Struct) do
         attribute :string, Fortnox::API::Types::Nullable::String
       end
+
+      stub_const('TestStruct', test_struct_class)
     end
 
     it { is_expected.to have_nullable(:string, 'A simple message', 0, '0') }
   end
 
   describe 'Float' do
-    using_test_class do
-      class TestStruct < Dry::Struct
+    before do
+      test_struct_class = Class.new(Dry::Struct) do
         attribute :float, Fortnox::API::Types::Nullable::Float
       end
+
+      stub_const('TestStruct', test_struct_class)
     end
 
     it { is_expected.to have_nullable(:float, 14.0, 'Not a Float!', 0.0) }
   end
 
   describe 'Integer' do
-    using_test_class do
-      class TestStruct < Dry::Struct
+    before do
+      test_struct_class = Class.new(Dry::Struct) do
         attribute :integer, Fortnox::API::Types::Nullable::Integer
       end
+
+      stub_const('TestStruct', test_struct_class)
     end
 
     it { is_expected.to have_nullable(:integer, 14, 14.0, 14) }
   end
 
   describe 'Boolean' do
-    using_test_class do
-      class TestStruct < Dry::Struct
+    before do
+      test_struct_class = Class.new(Dry::Struct) do
         attribute :boolean, Fortnox::API::Types::Nullable::Boolean
       end
+
+      stub_const('TestStruct', test_struct_class)
     end
 
     it { is_expected.to have_nullable(:boolean, true, 'Not a Boolean!', false) }
   end
 
   describe 'Date' do
-    using_test_class do
-      class TestStruct < Dry::Struct
+    before do
+      test_struct_class = Class.new(Dry::Struct) do
         attribute :date, Fortnox::API::Types::Nullable::Date
       end
+
+      stub_const('TestStruct', test_struct_class)
     end
 
     it { is_expected.to have_nullable_date(:date, Date.new(2016, 1, 1), 'Not a Date!') }
+
+    context 'with empty string' do
+      subject { TestStruct.new(date: '').date }
+
+      it { is_expected.to be_nil }
+    end
+
+    context 'with invalid date' do
+      it { expect { TestStruct.new(date: 'Not a Date!') }.to raise_error(Fortnox::API::AttributeError, /invalid date/) }
+    end
   end
 end

data/spec/fortnox/api/types/required_spec.rb

@@ -5,10 +5,7 @@ require 'fortnox/api/types'
 require 'fortnox/api/types/required'
 
 describe Fortnox::API::Types::Required, type: :type do
-  using_test_class do
-    class TestClass < Dry::Struct
-    end
-  end
+  before { stub_const('TestClass', Class.new(Dry::Struct)) }
 
   shared_examples_for 'required attribute' do |_type|
     subject { -> { TestClass.new({}) } }

data/spec/support/matchers/type/enum_matcher.rb

@@ -15,7 +15,7 @@ module Matchers
       private
 
       def expected_type?
-        @actual_type = @klass.schema[@attribute]
+        @actual_type = @klass.schema.keys.find { |x| x.name == @attribute }&.type
         @actual_type == @enum_type
       end
     end

data/spec/support/matchers/type/have_account_number_matcher.rb

@@ -15,7 +15,7 @@ module Matchers
       private
 
       def expected_type?
-        @actual_type = @klass.schema[@attribute]
+        @actual_type = @klass.schema.keys.find { |x| x.name == @attribute }&.type
         @actual_type == Fortnox::API::Types::AccountNumber
       end
     end

data/spec/support/matchers/type/have_email_matcher.rb

@@ -16,7 +16,7 @@ module Matchers
       private
 
       def expected_type?
-        @actual_type = @klass.schema[@attribute]
+        @actual_type = @klass.schema.keys.find { |x| x.name == @attribute }&.type
         @actual_type == Fortnox::API::Types::Email
       end
     end

data/spec/support/matchers/type/have_nullable_date_matcher.rb

@@ -11,7 +11,7 @@ module Matchers
         @attribute = attribute
         @valid_value = valid_value
         @invalid_value = invalid_value
-        @expected_error = ArgumentError
+        @expected_error = Fortnox::API::AttributeError
         @expected_error_message = 'invalid date'
         @failure_description = ''
       end
@@ -46,11 +46,11 @@ module Matchers
 
         @failure_description << " (Expected #{@expected_error}, but got none)"
         false
-      rescue @expected_error => error
-        return true if error.message == @expected_error_message
+      rescue @expected_error => e
+        return true if e.message == @expected_error_message
 
-        fail_message = "Expected error message to include #{expected_message.inspect}, "\
-                       "but was #{error.message.inspect}"
+        fail_message = "Expected error message to include #{@expected_error_message.inspect}, "\
+                       "but was #{e.message.inspect}"
         raise(fail_message)
       end
     end

data/spec/support/matchers/type/have_nullable_string_matcher.rb

@@ -33,13 +33,13 @@ module Matchers
       def rejects_non_string?
         non_string = 10.0
         @klass.new(@valid_hash.merge(@attribute => non_string))
-      rescue Fortnox::API::InvalidAttributeValueError => error
+      rescue Fortnox::API::AttributeError => e
         expected_message = "#{non_string.inspect} (#{non_string.class}) "\
                            "has invalid type for #{@attribute.inspect}"
-        return true if error.message.include?(expected_message)
+        return true if e.message.include?(expected_message)
 
         fail_message = "Expected error message to include #{expected_message.inspect}, "\
-                       "but was #{error.message.inspect}"
+                       "but was #{e.message.inspect}"
         raise(fail_message)
       end
     end