Merge pull request #2057 from senid231/fix-new-customer-auth-account-tom-select-flaky

Fix flaky feature specs: use select_tom_select_by_value for fillable tom-select fields

Author: dmitry-sinina

spec/features/rate_management/project/create_spec.rb

@@ -21,10 +21,10 @@
     let(:fill_form!) do
       fill_in 'Name', with: new_attrs[:name]
       fill_in_tom_select 'Vendor', with: new_attrs[:vendor].name, search: true
-      fill_in_tom_select 'Account', with: new_attrs[:account].name, search: true
+      select_tom_select_by_value 'Account', { new_attrs[:account].id => new_attrs[:account].name }
       fill_in_tom_select 'Routing group', with: new_attrs[:routing_group].name
       fill_in_tom_select 'Routeset discriminator', with: new_attrs[:routeset_discriminator].name
-      fill_in_tom_select 'Gateway', with: new_attrs[:gateway].name
+      select_tom_select_by_value 'Gateway', { new_attrs[:gateway].id => new_attrs[:gateway].name }
     end
 
     let(:new_attrs) do
@@ -63,9 +63,9 @@
       let(:fill_form!) do
         fill_in 'Name', with: new_attrs[:name]
         fill_in_tom_select 'Vendor', with: new_attrs[:vendor].name, search: true
-        fill_in_tom_select 'Account', with: new_attrs[:account].name, search: true
+        select_tom_select_by_value 'Account', { new_attrs[:account].id => new_attrs[:account].name }
         fill_in_tom_select 'Routing group', with: new_attrs[:routing_group].name
-        fill_in_tom_select 'Gateway', with: new_attrs[:gateway].name
+        select_tom_select_by_value 'Gateway', { new_attrs[:gateway].id => new_attrs[:gateway].name }
         fill_in_tom_select 'Routeset discriminator', with: new_attrs[:routeset_discriminator].name
         fill_in_tom_select 'Routing Tags', with: new_attrs[:routing_tags].first.name, multiple: true
         fill_in_tom_select 'Routing Tags', with: new_attrs[:routing_tags].second.name, multiple: true
@@ -179,10 +179,10 @@
       let(:fill_form!) do
         fill_in 'Name', with: new_attrs[:name]
         fill_in_tom_select 'Vendor', with: new_attrs[:vendor].name, search: true
-        fill_in_tom_select 'Account', with: new_attrs[:account].name, search: true
+        select_tom_select_by_value 'Account', { new_attrs[:account].id => new_attrs[:account].name }
         fill_in_tom_select 'Routing group', with: new_attrs[:routing_group].name
         fill_in_tom_select 'Routeset discriminator', with: new_attrs[:routeset_discriminator].name
-        fill_in_tom_select 'Gateway', with: new_attrs[:gateway].name
+        select_tom_select_by_value 'Gateway', { new_attrs[:gateway].id => new_attrs[:gateway].name }
         fill_in_tom_select 'Routing Tags', with: routing_tags.third.name, multiple: true
         fill_in_tom_select 'Routing Tags', with: Routing::RoutingTag::ANY_TAG, multiple: true
         fill_in_tom_select 'Routing Tags', with: routing_tags.first.name, multiple: true

spec/features/rate_management/project/update_spec.rb

@@ -14,7 +14,7 @@
   let(:fill_form!) do
     fill_in 'Name', with: new_name
     clear_tom_select 'Gateway'
-    fill_in_tom_select 'Gateway Group', with: gateway_group.display_name
+    select_tom_select_by_value 'Gateway Group', { gateway_group.id => gateway_group.display_name }
     tom_select_deselect_values 'Routing Tags', values: record.routing_tags.map(&:name)
   end
 
@@ -37,10 +37,10 @@
   context 'when project with same scope attributes exists' do
     let(:fill_form!) do
       fill_in_tom_select 'Vendor', with: another_project.vendor.name, search: true
-      fill_in_tom_select 'Account', with: another_project.account.name, search: true
+      select_tom_select_by_value 'Account', { another_project.account.id => another_project.account.name }
       fill_in_tom_select 'Routing group', with: another_project.routing_group.name
       fill_in_tom_select 'Routeset discriminator', with: another_project.routeset_discriminator.name
-      fill_in_tom_select 'Gateway', with: another_gateway.name
+      select_tom_select_by_value 'Gateway', { another_gateway.id => another_gateway.name }
     end
     let!(:another_project) do
       FactoryBot.create(:rate_management_project, :filled)

spec/features/routing/customers_auths/new_customer_auth_spec.rb

@@ -19,10 +19,10 @@
   let(:fill_form!) do
     fill_in 'Name', with: 'Test'
     fill_in_tom_select 'Customer', with: customer.name, search: true
-    fill_in_tom_select 'Account', with: account.name
+    select_tom_select_by_value 'Account', { account.id => account.name }
     fill_in_tom_select 'DST Numberlist', with: dst_numberlist.display_name, search: true
     fill_in_tom_select 'SRC Numberlist', with: src_numberlist.display_name, search: true
-    fill_in_tom_select 'Gateway', with: gateway.name
+    select_tom_select_by_value 'Gateway', { gateway.id => gateway.name }
     fill_in_tom_select 'Rateplan', with: rateplan.name
     fill_in_tom_select 'Routing plan', with: routing_plan.name
   end

spec/features/routing/dialpeers/edit_dialpeer_spec.rb

@@ -138,7 +138,7 @@
     let!(:account) { FactoryBot.create(:account, contractor: vendor) }
     let(:fill_form!) do
       fill_in_tom_select 'Vendor', with: vendor.name, search: true
-      fill_in_tom_select 'Account', with: account.name, search: true
+      select_tom_select_by_value 'Account', { account.id => account.name }
     end
 
     it 'does not update dialpeer' do
@@ -183,7 +183,7 @@
       context 'with gateway' do
         let(:fill_form!) do
           super()
-          fill_in_tom_select 'Gateway', with: gateway.name, exact_label: true
+          select_tom_select_by_value 'Gateway', { gateway.id => gateway.name }, exact_label: true
         end
 
         it 'updates correctly' do
@@ -213,7 +213,7 @@
       context 'with gateway_group' do
         let(:fill_form!) do
           super()
-          fill_in_tom_select 'Gateway Group', with: gateway_group.name
+          select_tom_select_by_value 'Gateway Group', { gateway_group.id => gateway_group.name }
         end
 
         it 'updates correctly' do

spec/features/routing/dialpeers/new_dialpeer_spec.rb

@@ -67,10 +67,10 @@
     fill_in 'Initial rate', with: '0.1'
     fill_in 'Next rate', with: '0.2'
     fill_in_tom_select 'Vendor', with: vendor.display_name, search: true
-    fill_in_tom_select 'Account', with: account.display_name, search: true
+    select_tom_select_by_value 'Account', { account.id => account.display_name }
     fill_in_tom_select 'Routing group', with: routing_group.display_name
     fill_in_tom_select 'Routeset discriminator', with: routeset_discriminator.display_name
-    fill_in_tom_select 'Gateway', with: gateway.display_name
+    select_tom_select_by_value 'Gateway', { gateway.id => gateway.display_name }
     fill_in_tom_select 'Currency', with: currency.name
   end
 
@@ -161,10 +161,10 @@
       fill_in 'Initial rate', with: '0.1'
       fill_in 'Next rate', with: '0.2'
       fill_in_tom_select 'Vendor', with: vendor.display_name, search: true
-      fill_in_tom_select 'Account', with: account.display_name, search: true
+      select_tom_select_by_value 'Account', { account.id => account.display_name }
       fill_in_tom_select 'Routing group', with: routing_group.display_name
       fill_in_tom_select 'Routeset discriminator', with: routeset_discriminator.display_name
-      fill_in_tom_select 'Gateway Group', with: gateway_group.display_name
+      select_tom_select_by_value 'Gateway Group', { gateway_group.id => gateway_group.display_name }
       fill_in_tom_select 'Currency', with: currency.name
     end
 
@@ -193,11 +193,11 @@
       fill_in 'Initial rate', with: '0.1'
       fill_in 'Next rate', with: '0.2'
       fill_in_tom_select 'Vendor', with: vendor.display_name, search: true
-      fill_in_tom_select 'Account', with: account.display_name, search: true
+      select_tom_select_by_value 'Account', { account.id => account.display_name }
       fill_in_tom_select 'Routing group', with: routing_group.display_name
       fill_in_tom_select 'Routeset discriminator', with: routeset_discriminator.display_name
-      fill_in_tom_select 'Gateway', with: gateway.display_name
-      fill_in_tom_select 'Gateway Group', with: gateway_group.display_name
+      select_tom_select_by_value 'Gateway', { gateway.id => gateway.display_name }
+      select_tom_select_by_value 'Gateway Group', { gateway_group.id => gateway_group.display_name }
       fill_in_tom_select 'Currency', with: currency.name
     end