Merge remote-tracking branch 'origin/master' into 509-directo-to-gem

test/integration/contact/audit_log_test.rb

@@ -5,7 +5,7 @@ class ContactAuditLogTest < ActionDispatch::IntegrationTest
     contact = contacts(:john)
 
     contact.legal_document_id = 1
-    assert_difference 'contact.versions.count' do
+    assert_difference 'contact.versions.count', 1 do
       contact.save!
     end
 
@@ -13,4 +13,4 @@ class ContactAuditLogTest < ActionDispatch::IntegrationTest
     assert_equal ({ legal_documents: [1] }).with_indifferent_access,
                  contact_version.children.with_indifferent_access
   end
-end
+end

test/integration/domain/audit_log_test.rb

@@ -14,7 +14,7 @@ class DomainAuditLogTest < ActionDispatch::IntegrationTest
     assert_equal registrant_id, domain.registrant_id
     domain.legal_document_id = legal_document_id
 
-    assert_difference 'domain.versions.count' do
+    assert_difference 'domain.versions.count', 1 do
       domain.save!
     end
 
@@ -26,4 +26,4 @@ class DomainAuditLogTest < ActionDispatch::IntegrationTest
     assert_equal [legal_document_id], domain_version.children['legal_documents']
     assert_equal [registrant_id], domain_version.children['registrant']
   end
-end
+end

test/jobs/directo_invoice_forward_job_test.rb

@@ -9,12 +9,21 @@ class DirectoInvoiceForwardJobTest < ActiveSupport::TestCase
     @invoice.update(total: @invoice.account_activity.bank_transaction.sum)
     @invoice.account_activity.bank_transaction.update(paid_at: Time.zone.now)
 
+    response = <<-XML
+      <?xml version="1.0" encoding="UTF-8"?>
+      <results>
+        <Result Type="0" Desc="OK" docid="1" doctype="ARVE" submit="Invoices"/>
+      </results>
+    XML
+
     stub_request(:post, ENV['directo_invoice_url']).with do |request|
       request.body.include? 'TransactionDate'
-    end
+    end.to_return(status: 200, body: response)
 
     assert_nothing_raised do
-      DirectoInvoiceForwardJob.run(monthly: false)
+      Directo.send_receipts
     end
+
+    assert_not_empty @invoice.directo_records.first.request
   end
 end

test/learning/paper_trail_test.rb

@@ -21,6 +21,25 @@ class PaperTrailLearningTest < ActiveSupport::TestCase
     assert_respond_to @record.versions.first, :item_id
   end
 
+  def test_returns_version_count_on_domains
+    @domain = domains(:airport)
+    @domain.save
+
+    assert_equal 1, @domain.versions.count
+
+    @domain.name = 'domain.test'
+    @domain.save!
+    assert_equal 2, @domain.versions.count
+  end
+
+  def test_returns_version_count_on_users
+    @user = users(:registrant)
+
+    @user.email = 'aaa@bbb.com'
+    @user.save!
+    assert_equal 1, @user.versions.count
+  end
+
   def test_creates_new_version_upon_update
     @record = Post.create!(title: 'old title')
     original_record = @record.clone
@@ -40,7 +59,7 @@ class PaperTrailLearningTest < ActiveSupport::TestCase
     @record = Post.create!(title: 'any')
 
     assert_difference -> { @record.versions.size } do
-      @record.touch_with_version
+      @record.paper_trail.touch_with_version
     end
   end
-end
+end

test/models/deposit_test.rb

@@ -36,22 +36,22 @@ class DepositTest < ActiveSupport::TestCase
 
   def test_amount_is_converted_from_string
     @deposit.amount = "12.00"
-    assert_equal(BigDecimal.new("12.00"), @deposit.amount)
+    assert_equal(BigDecimal("12.00"), @deposit.amount)
 
     @deposit.amount = "12,11"
-    assert_equal(BigDecimal.new("12.11"), @deposit.amount)
+    assert_equal(BigDecimal("12.11"), @deposit.amount)
   end
 
   def test_amount_is_converted_from_float
     @deposit.amount = 12.0044
-    assert_equal(BigDecimal.new("12.0044"), @deposit.amount)
+    assert_equal(BigDecimal("12.0044"), @deposit.amount)
 
     @deposit.amount = 12.0144
-    assert_equal(BigDecimal.new("12.0144"), @deposit.amount)
+    assert_equal(BigDecimal("12.0144"), @deposit.amount)
   end
 
   def test_amount_is_converted_from_nil
     @deposit.amount = nil
-    assert_equal(BigDecimal.new("0.00"), @deposit.amount)
+    assert_equal(BigDecimal("0.00"), @deposit.amount)
   end
 end

test/models/dns/domain_name_test.rb

@@ -13,6 +13,8 @@ class AuctionDoubleTest < ActiveSupport::TestCase
 end
 
 class DNS::DomainNameTest < ActiveSupport::TestCase
+  fixtures 'whois/records'
+
   def test_available_when_not_at_auction
     domain_name = DNS::DomainName.new('auction.test')
     auctions(:one).update!(domain: 'auction.test', status: Auction.statuses[:domain_registered])

test/support/rails5_assertions.rb

@@ -1,96 +0,0 @@
-# Built-in since Rails 5.1
-
-module ActiveSupport
-  module Testing
-    module Assertions
-      UNTRACKED = Object.new # :nodoc:
-
-      # Assertion that the result of evaluating an expression is changed before
-      # and after invoking the passed in block.
-      #
-      #   assert_changes 'Status.all_good?' do
-      #     post :create, params: { status: { ok: false } }
-      #   end
-      #
-      # You can pass the block as a string to be evaluated in the context of
-      # the block. A lambda can be passed for the block as well.
-      #
-      #   assert_changes -> { Status.all_good? } do
-      #     post :create, params: { status: { ok: false } }
-      #   end
-      #
-      # The assertion is useful to test side effects. The passed block can be
-      # anything that can be converted to string with #to_s.
-      #
-      #   assert_changes :@object do
-      #     @object = 42
-      #   end
-      #
-      # The keyword arguments :from and :to can be given to specify the
-      # expected initial value and the expected value after the block was
-      # executed.
-      #
-      #   assert_changes :@object, from: nil, to: :foo do
-      #     @object = :foo
-      #   end
-      #
-      # An error message can be specified.
-      #
-      #   assert_changes -> { Status.all_good? }, 'Expected the status to be bad' do
-      #     post :create, params: { status: { incident: true } }
-      #   end
-      def assert_changes(expression, message = nil, from: UNTRACKED, to: UNTRACKED, &block)
-        exp = expression.respond_to?(:call) ? expression : -> { eval(expression.to_s, block.binding) }
-
-        before = exp.call
-        retval = yield
-
-        unless from == UNTRACKED
-          error = "#{expression.inspect} isn't #{from.inspect}"
-          error = "#{message}.\n#{error}" if message
-          assert from === before, error
-        end
-
-        after = exp.call
-
-        if to == UNTRACKED
-          error = "#{expression.inspect} didn't changed"
-          error = "#{message}.\n#{error}" if message
-          assert_not_equal before, after, error
-        else
-          error = "#{expression.inspect} didn't change to #{to}"
-          error = "#{message}.\n#{error}" if message
-          assert to === after, error
-        end
-
-        retval
-      end
-
-      # Assertion that the result of evaluating an expression is changed before
-      # and after invoking the passed in block.
-      #
-      #   assert_no_changes 'Status.all_good?' do
-      #     post :create, params: { status: { ok: true } }
-      #   end
-      #
-      # An error message can be specified.
-      #
-      #   assert_no_changes -> { Status.all_good? }, 'Expected the status to be good' do
-      #     post :create, params: { status: { ok: false } }
-      #   end
-      def assert_no_changes(expression, message = nil, &block)
-        exp = expression.respond_to?(:call) ? expression : -> { eval(expression.to_s, block.binding) }
-
-        before = exp.call
-        retval = yield
-        after = exp.call
-
-        error = "#{expression.inspect} did change to #{after}"
-        error = "#{message}.\n#{error}" if message
-        assert_equal before, after, error
-
-        retval
-      end
-    end
-  end
-end

test/test_helper.rb

@@ -16,7 +16,6 @@ require 'minitest/mock'
 require 'capybara/rails'
 require 'capybara/minitest'
 require 'webmock/minitest'
-require 'support/rails5_assertions' # Remove once upgraded to Rails 5.1
 require 'support/assertions/epp_assertions'