fixed tests

internetee · Jan 23, 2023 · 50ea5a3 · 50ea5a3
1 parent 4b48450
commit 50ea5a3
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 22 deletions.
diff --git a/app/controllers/eis_billing/invoices_controller.rb b/app/controllers/eis_billing/invoices_controller.rb
@@ -9,10 +9,6 @@ class InvoicesController < BaseController
     before_action :load_invoice, only: :update
 
     def update
-      p '=========='
-      p params
-      p '=========='
-
       if @invoice.update(modified_params) && payment_orders_handler
 
         render json: {
@@ -30,12 +26,6 @@ def update
     private
 
     def payment_orders_handler
-      p '-----'
-      p @invoice.cancelled?
-      p status.issued?
-      p status
-      p '------'
-
       if @invoice.payment_orders.present?
         if @invoice.cancelled? && status.paid? || @invoice.cancelled? && status.issued?
           @invoice.errors.add(:base, 'Unable to change status of record')
@@ -49,7 +39,9 @@ def payment_orders_handler
           return false
         end
 
-        return true if (@invoice.paid? && status.paid?) || (@invoice.unpaid? && status.issued?) || (@invoice.cancelled? && status.cancelled?)
+        return true if (@invoice.paid? && status.paid?) ||
+                       (@invoice.unpaid? && status.issued?) ||
+                       (@invoice.cancelled? && (status.cancelled? || status.failed?))
 
         if status.issued?
           @invoice.cancel_manualy
@@ -66,7 +58,7 @@ def payment_orders_handler
     end
 
     def status
-      status = case params[:status][:status]
+      status = case params[:status]
                when 'paid'
                  'paid'
                when 'cancelled'

diff --git a/test/integration/eis_billing/invoices_test.rb b/test/integration/eis_billing/invoices_test.rb
@@ -38,7 +38,8 @@ class EInvoiceResponseTest < ApplicationIntegrationTest
           'some' => 'some'
         },
         sent_at_omniva: Time.zone.now - 10.minutes
-      }
+      },
+      status: 'paid'
     }
 
     @invoice.account_activity.delete && @invoice.reload
@@ -65,7 +66,8 @@ class EInvoiceResponseTest < ApplicationIntegrationTest
           'some' => 'some'
         },
         sent_at_omniva: Time.zone.now - 10.minutes
-      }
+      },
+      status: 'unpaid'
     }
 
     assert_equal @invoice.payment_orders.pluck(:status), %w[issued issued]
@@ -89,7 +91,7 @@ class EInvoiceResponseTest < ApplicationIntegrationTest
     invoice.update(total: 120.0)
     invoice.reload
 
-    incoming_params = { 
+    incoming_params = {
         invoice: {
           invoice_number: invoice.number,
           initiator: 'registry',
@@ -101,7 +103,8 @@ class EInvoiceResponseTest < ApplicationIntegrationTest
             'some' => 'some'
           },
           sent_at_omniva: Time.zone.now - 10.minutes
-        }
+        },
+        status: 'paid'
     }
 
     assert invoice.payment_orders.empty?
@@ -130,7 +133,8 @@ class EInvoiceResponseTest < ApplicationIntegrationTest
           'some' => 'some'
         },
         sent_at_omniva: Time.zone.now - 10.minutes
-      }
+      },
+      status: 'cancelled'
     }
 
     @invoice.payment_orders.destroy_all and @invoice.account_activity.destroy
@@ -165,7 +169,8 @@ class EInvoiceResponseTest < ApplicationIntegrationTest
           'some' => 'some'
         },
         sent_at_omniva: Time.zone.now - 10.minutes
-      }
+      },
+      status: 'paid'
     }
 
     assert invoice.payment_orders.empty?
@@ -208,7 +213,8 @@ class EInvoiceResponseTest < ApplicationIntegrationTest
           'some' => 'some'
         },
         sent_at_omniva: Time.zone.now - 10.minutes
-      }
+      },
+      status: 'paid'
     }
 
     put eis_billing_invoices_path, params: incoming_params
@@ -237,7 +243,8 @@ class EInvoiceResponseTest < ApplicationIntegrationTest
           'some' => 'some'
         },
         sent_at_omniva: Time.zone.now - 10.minutes
-      }
+      },
+      status: 'paid'
     }
 
     assert invoice.payment_orders.empty?
@@ -271,7 +278,8 @@ class EInvoiceResponseTest < ApplicationIntegrationTest
           'some' => 'some'
         },
         sent_at_omniva: Time.zone.now - 10.minutes
-      }
+      },
+      status: 'unpaid'
     }
 
     put eis_billing_invoices_path, params: decrease_balance_params
@@ -296,7 +304,8 @@ class EInvoiceResponseTest < ApplicationIntegrationTest
           'some' => 'some'
         },
         sent_at_omniva: Time.zone.now - 10.minutes
-      }
+      },
+      status: 'paid'
     }
 
     put eis_billing_invoices_path, params: incoming_params