Improve stability of integration specs

Author: mshibuya

spec/integration/actions/edit_spec.rb

@@ -774,6 +774,7 @@ class HelpTest < Tableless
 
       execute_script %{$('.form-actions [name="_save"]').attr('name', 'player[name]').attr('value', 'Jackie Robinson')}
       find_button('Save').trigger('click')
+      is_expected.to have_text 'Player successfully updated'
     end
 
     it 'submits the value' do

spec/integration/authentication/devise_spec.rb

@@ -20,7 +20,7 @@
     fill_in 'Email', with: user.email
     fill_in 'Password', with: 'password'
     click_button 'Log in'
-    is_expected.to have_content 'Site Administration'
+    is_expected.to have_css 'body.rails_admin'
   end
 
   it 'supports logging-out', js: true do

spec/integration/fields/ck_editor_spec.rb

@@ -14,20 +14,4 @@
     expect { visit new_path(model_name: 'draft') }.not_to raise_error
     is_expected.to have_selector('#cke_draft_notes')
   end
-
-  it 'supports focusing on sub-modals', js: true do
-    RailsAdmin.config Comment do
-      edit do
-        field :content, :ck_editor
-      end
-    end
-    visit new_path(model_name: 'player')
-    find_link('Add a new Comment').trigger 'click'
-    expect(page).to have_text 'New Comment'
-    expect(page).to have_css '.cke_button__link'
-    find('.cke_button__link').click
-    expect(page).to have_css '.cke_dialog_ui_input_text'
-    first(:css, '.cke_dialog_ui_input_text').click
-    expect(page).to have_css '.cke_dialog_ui_input_text:focus'
-  end
 end

spec/integration/fields/has_many_association_spec.rb

@@ -164,6 +164,7 @@
       expect(find("select#managing_user_team_ids option[value=\"#{teams[0].id}\"]")).to have_content teams[0].name
       select(teams[1].name, from: 'Teams')
       click_button 'Save'
+      is_expected.to have_content 'Managing user successfully updated'
       expect(ManagingUser.first.teams).to match_array teams
     end
 
@@ -180,6 +181,7 @@
         find('.ra-multiselect-collection option', text: teams[1].name).select_option
         find('.ra-multiselect-item-add').click
         click_button 'Save'
+        is_expected.to have_content 'Managing user successfully updated'
         expect(ManagingUser.first.teams).to match_array teams
       end
     end

spec/integration/fields/has_one_association_spec.rb

@@ -76,6 +76,7 @@
       visit edit_path(model_name: 'managing_user', id: user.id)
       select(team.name, from: 'Team')
       click_button 'Save'
+      is_expected.to have_content 'Managing user successfully updated'
       expect(ManagingUser.first.team).to eq team
     end
 
@@ -93,6 +94,7 @@
         expect(page).to have_selector('ul.ui-autocomplete li.ui-menu-item a')
         page.execute_script %{[...document.querySelectorAll('ul.ui-autocomplete li.ui-menu-item')].find(e => e.innerText.includes("#{team.name}")).click()}
         click_button 'Save'
+        is_expected.to have_content 'Managing user successfully updated'
         expect(ManagingUser.first.team).to eq team
       end
     end

spec/integration/widgets/datetimepicker_spec.rb

@@ -3,6 +3,8 @@
 require 'spec_helper'
 
 RSpec.describe 'Datetimepicker widget', type: :request, js: true do
+  subject { page }
+
   before do
     RailsAdmin.config FieldTest do
       edit do
@@ -52,6 +54,7 @@
       end
     end
     visit new_path(model_name: 'field_test')
+    is_expected.to have_text 'New Field test'
     page.execute_script <<-JS
       document.querySelector('#field_test_datetime_field')._flatpickr.setDate('2015-10-08 12:34:56');
     JS

spec/integration/widgets/remote_form_spec.rb

@@ -5,6 +5,18 @@
 RSpec.describe 'Remote form widget', type: :request, js: true do
   subject { page }
 
+  describe 'modal' do
+    it 'supports focusing on sub-modals' do
+      visit new_path(model_name: 'division')
+      click_link 'Add a new League'
+      is_expected.to have_content 'New League'
+      is_expected.not_to have_css '#modal.modal-static'
+      execute_script %($(document.body).append($('<div id="sub-modal" class="modal d-block"><input type="text" /></div>')))
+      find('#sub-modal input').click
+      is_expected.to have_css '#sub-modal input:focus'
+    end
+  end
+
   context 'with filtering select widget' do
     let(:league) { FactoryBot.create :league }
     let(:division) { FactoryBot.create :division, league: league }
@@ -119,7 +131,7 @@
       is_expected.to have_content 'New Field test'
       attach_file 'Carrierwave asset', file_path('test.jpg')
       find('#modal .save-action').click
-      is_expected.to have_css('#modal.fade')
+      is_expected.to have_css('option', text: /FieldTest #/, visible: false)
       expect(FieldTest.first.carrierwave_asset.file.size).to eq 1575
     end
   end