Merge pull request #2433 from internetee/remove-feature-toggle

remove eis-billing feature toggle

test/integration/admin_area/invoices_test.rb

@@ -24,30 +24,28 @@ class AdminAreaInvoicesIntegrationTest < ApplicationIntegrationTest
   end
 
   def test_create_new_invoice
-    if Feature.billing_system_integrated?
-      invoice_n = Invoice.order(number: :desc).last.number
+    invoice_n = Invoice.order(number: :desc).last.number
 
-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
-        to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_generator").
+      to_return(status: 200, body: "{\"everypay_link\":\"http://link.test\"}", headers: {})
 
-      stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
-        to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator").
+      to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
 
-      stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
-        to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
+    stub_request(:put, "https://registry:3000/eis_billing/e_invoice_response").
+      to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}, {\"date\":\"#{Time.zone.now-10.minutes}\"}", headers: {})
 
-      stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
-        to_return(status: 200, body: "", headers: {})
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").
+      to_return(status: 200, body: "", headers: {})
 
-      visit new_admin_invoice_path
+    visit new_admin_invoice_path
 
-      assert_text 'Create new invoice'
-      select 'Best Names', from: 'deposit_registrar_id', match: :first
-      fill_in 'Amount', with: '1000'
-      click_on 'Save'
+    assert_text 'Create new invoice'
+    select 'Best Names', from: 'deposit_registrar_id', match: :first
+    fill_in 'Amount', with: '1000'
+    click_on 'Save'
 
-      assert_equal page.status_code, 200
-    end
+    assert_equal page.status_code, 200
   end
 
   def test_visit_list_of_invoices_pages

test/integration/eis_billing/directo_response_test.rb

@@ -10,34 +10,30 @@ class DirectoResponseTest < ApplicationIntegrationTest
   end
 
   def test_should_created_directo_instance
-    if Feature.billing_system_integrated?
-      directo_response_from_billing = {
-        response: @response_xml,
-        month: true
-      }
+    directo_response_from_billing = {
+      response: @response_xml,
+      month: true
+    }
 
-      assert_difference 'Directo.count', 1 do
-        put eis_billing_directo_response_path, params: JSON.parse(directo_response_from_billing.to_json),
-        headers: { 'HTTP_COOKIE' => 'session=api_bestnames' }
-      end
+    assert_difference 'Directo.count', 1 do
+      put eis_billing_directo_response_path, params: JSON.parse(directo_response_from_billing.to_json),
+      headers: { 'HTTP_COOKIE' => 'session=api_bestnames' }
     end
   end
 
   def test_should_update_related_invoice
-    if Feature.billing_system_integrated?
-      directo_response_from_billing = {
-        response: @response_xml
-      }
+    directo_response_from_billing = {
+      response: @response_xml
+    }
 
-      refute @invoice.in_directo
+    refute @invoice.in_directo
 
-      assert_difference 'Directo.count', 1 do
-        put eis_billing_directo_response_path, params: JSON.parse(directo_response_from_billing.to_json),
-        headers: { 'HTTP_COOKIE' => 'session=api_bestnames' }
-      end
-
-      @invoice.reload
-      assert @invoice.in_directo
+    assert_difference 'Directo.count', 1 do
+      put eis_billing_directo_response_path, params: JSON.parse(directo_response_from_billing.to_json),
+      headers: { 'HTTP_COOKIE' => 'session=api_bestnames' }
     end
+
+    @invoice.reload
+    assert @invoice.in_directo
   end
 end

test/integration/eis_billing/lhv_connect_transactions_test.rb

@@ -8,8 +8,6 @@ class LhvConnectTransactionsIntegrationTest < ApplicationIntegrationTest
   end
 
   def test_should_saved_transaction_data
-    return unless Feature.billing_system_integrated?
-
     test_transaction_1 = OpenStruct.new(amount: 0.1,
                                         currency: 'EUR',
                                         date: Time.zone.today,

test/integration/repp/v1/invoices/add_credit_test.rb

@@ -12,6 +12,18 @@ class ReppV1InvoicesAddCreditTest < ActionDispatch::IntegrationTest
     eis_response = OpenStruct.new(body: '{"everypay_link":"https://link.test"}')
     Spy.on_instance_method(EisBilling::AddDeposits, :send_invoice).and_return(eis_response)
     Spy.on_instance_method(EisBilling::BaseController, :authorized).and_return(true)
+
+    invoice = Invoice.last
+    msg = {
+      invoice_number: invoice.number + 3
+    }
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator")
+      .to_return(status: 200, body: msg.to_json, headers: {})
+
+    msg2 = {
+      message: 'success'
+    }
+    stub_request(:post, "https://eis_billing_system:3000/api/v1/e_invoice/e_invoice").to_return(status: 200, body: msg2.to_json, headers: {})
   end
 
   teardown do
@@ -28,13 +40,11 @@ class ReppV1InvoicesAddCreditTest < ActionDispatch::IntegrationTest
     Setting.registry_vat_prc = 0.1
     ENV['billing_system_integrated'] = 'true'
 
-    if Feature.billing_system_integrated?
-      invoice_n = Invoice.order(number: :desc).last.number
-      stub_request(:post, 'https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator')
-        .to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
-      stub_request(:post, 'https://eis_billing_system:3000/api/v1/e_invoice/e_invoice')
-        .to_return(status: 200, body: '', headers: {})
-    end
+    invoice_n = Invoice.order(number: :desc).last.number
+    stub_request(:post, 'https://eis_billing_system:3000/api/v1/invoice_generator/invoice_number_generator')
+      .to_return(status: 200, body: "{\"invoice_number\":\"#{invoice_n + 3}\"}", headers: {})
+    stub_request(:post, 'https://eis_billing_system:3000/api/v1/e_invoice/e_invoice')
+      .to_return(status: 200, body: '', headers: {})
 
     post '/repp/v1/invoices/add_credit', headers: @auth_headers,
                                          params: request_body