Merge pull request #1237 from internetee/improve-tests

Improve tests

test/fixtures/bank_transactions.yml

@@ -1,8 +1,5 @@
 one:
   sum: 1
   currency: EUR
-
+  description: Order nr. 1
-for_payments_test:
+  iban: US75512108001245126199
-  description: "Order nr. 1"
-  currency: "EUR"
-  iban: "1234"

test/fixtures/invoices.yml

@@ -2,24 +2,11 @@ one:
   issue_date: <%= Date.parse '2010-07-05' %>
   due_date: <%= Date.parse '2010-07-06' %>
   currency: EUR
-  seller_name: John Doe
+  seller_name: Seller Ltd
-  seller_iban: 1234
+  seller_iban: US75512108001245126199
   buyer: bestnames
-  buyer_name: Jane Doe
+  buyer_name: Buyer Ltd
   vat_rate: 0.1
   total: 16.50
   reference_no: 13
-  number: 1
+  number: 1
-
-for_payments_test:
-  number: 1
-  issue_date: <%= Date.parse '2010-07-05' %>
-  due_date: <%= Date.parse '2010-07-06' %>
-  currency: EUR
-  seller_name: John Doe
-  seller_iban: 1234
-  buyer: bestnames
-  buyer_name: Jane Doe
-  vat_rate: 0.1
-  reference_no: 13
-  total: 12.00

test/models/payment_orders/bank_link_test.rb

@@ -7,11 +7,8 @@ class BankLinkTest < ActiveSupport::TestCase
   def setup
     super
 
-    @invoice = invoices(:for_payments_test)
+    @invoice = invoices(:one)
-    invoice_item = invoice_items(:one)
+    @invoice.update!(total: 12)
-
-    @invoice.items << invoice_item
-    @invoice.items << invoice_item
 
     travel_to '2018-04-01 00:30 +0300'
     create_new_bank_link
@@ -19,12 +16,6 @@ class BankLinkTest < ActiveSupport::TestCase
     create_cancelled_bank_link
   end
 
-  def teardown
-    super
-
-    travel_back
-  end
-
   def create_completed_bank_link
     params = {
       'VK_SERVICE': '1111',

test/models/payment_orders/every_pay_test.rb

@@ -4,11 +4,8 @@ class EveryPayTest < ActiveSupport::TestCase
   def setup
     super
 
-    @invoice = invoices(:for_payments_test)
+    @invoice = invoices(:one)
-    invoice_item = invoice_items(:one)
+    @invoice.update!(total: 12)
-
-    @invoice.items << invoice_item
-    @invoice.items << invoice_item
 
     params = {
       response:
@@ -41,12 +38,6 @@ class EveryPayTest < ActiveSupport::TestCase
     travel_to Time.zone.parse('2018-04-01 00:30:00 +0000')
   end
 
-  def teardown
-    super
-
-    travel_back
-  end
-
   def test_form_fields
     expected_fields = {
       api_username: 'api_user',

test/system/registrar_area/invoices/payment_callback_test.rb

@@ -8,13 +8,30 @@ class PaymentCallbackTest < ApplicationSystemTestCase
     sign_in @user
   end
 
-  def create_invoice_with_items
+  def test_every_pay_callback_returns_status_200
-    @invoice = invoices(:for_payments_test)
+    invoice = payable_invoice
-    invoice_item = invoice_items(:one)
+    assert_matching_bank_transaction_exists(invoice)
 
-    @invoice.items << invoice_item
+    request_params = every_pay_request_params.merge(invoice_id: invoice.id)
-    @invoice.items << invoice_item
+    post "/registrar/pay/callback/every_pay", request_params
-    @user.registrar.invoices << @invoice
+
+    assert_response :ok
+  end
+
+  private
+
+  def payable_invoice
+    invoice = invoices(:one)
+    invoice.update!(account_activity: nil)
+    invoice
+  end
+
+  def assert_matching_bank_transaction_exists(invoice)
+    assert BankTransaction.find_by(
+      description: invoice.order,
+      currency: invoice.currency,
+      iban: invoice.seller_iban
+    ), 'Matching bank transaction should exist'
   end
 
   def every_pay_request_params
@@ -39,11 +56,4 @@ class PaymentCallbackTest < ApplicationSystemTestCase
       payment_method:      "every_pay"
     }
   end
-
+end
-  def test_every_pay_callback_returns_status_200
-    create_invoice_with_items
-    request_params = every_pay_request_params.merge(invoice_id: @invoice.id)
-    post "/registrar/pay/callback/every_pay", request_params
-    assert_equal(200, response.status)
-  end
-end

test/system/registrar_area/invoices/payment_return_test.rb

@@ -6,15 +6,8 @@ class PaymentReturnTest < ApplicationSystemTestCase
 
     @user = users(:api_bestnames)
     sign_in @user
-  end
 
-  def create_invoice_with_items
+    @invoice = invoices(:one)
-    @invoice = invoices(:for_payments_test)
-    invoice_item = invoice_items(:one)
-
-    @invoice.items << invoice_item
-    @invoice.items << invoice_item
-    @user.registrar.invoices << @invoice
   end
 
   def every_pay_request_params
@@ -65,7 +58,6 @@ class PaymentReturnTest < ApplicationSystemTestCase
   end
 
   def test_every_pay_return_creates_activity_redirects_to_invoice_path
-    create_invoice_with_items
     request_params = every_pay_request_params.merge(invoice_id: @invoice.id)
 
     post "/registrar/pay/return/every_pay", request_params
@@ -74,7 +66,6 @@ class PaymentReturnTest < ApplicationSystemTestCase
   end
 
   def test_Every_Pay_return_raises_RecordNotFound
-    create_invoice_with_items
     request_params = every_pay_request_params.merge(invoice_id: "178907")
     assert_raises(ActiveRecord::RecordNotFound) do
       post "/registrar/pay/return/every_pay", request_params
@@ -82,7 +73,6 @@ class PaymentReturnTest < ApplicationSystemTestCase
   end
 
   def test_bank_link_return_redirects_to_invoice_paths
-    create_invoice_with_items
     request_params = bank_link_request_params.merge(invoice_id: @invoice.id)
 
     post "/registrar/pay/return/seb", request_params
@@ -91,7 +81,6 @@ class PaymentReturnTest < ApplicationSystemTestCase
   end
 
   def test_bank_link_return
-    create_invoice_with_items
     request_params = bank_link_request_params.merge(invoice_id: "178907")
     assert_raises(ActiveRecord::RecordNotFound) do
       post "/registrar/pay/return/seb", request_params