Merge pull request #671 from PecanProject/fix_issue_667

Change RSpec test set to work under Ruby 2.6

spec/controllers/bulk_upload_controller_spec.rb

@@ -119,7 +119,10 @@ class BulkUploadController
 
       # TODO: possibly test various kinds of invalid files and what messages result
       context "uploading an invalid csv file" do
-        it "should throw an error and redirect to the start_upload page" do
+        # This test tests for blank lines in the CSV file, which are no longer
+        # invalid in Ruby 2.6.  So we skip this test but keep it around for
+        # documentation.
+        it "should throw an error and redirect to the start_upload page", skip: true do
 
           @file = fixture_file_upload("/files/bulk_upload/invalid_file.csv", "text/csv")
           @form = { 'new upload' => true, "CSV file" => @file }

spec/features/site_integration_spec.rb

@@ -56,7 +56,9 @@
       it 'show allow adding new related citations', js: true do
         click_link 'View Related Citations'
         fill_in 'search_citations', with: 'Wood'
-        sleep 2 # 1 often isn't enough
+        # In Ruby 2.6 especially, merely filling in a field doesn't seem to
+        # trigger the needed keyup event, so do it manually:
+        find_field('search_citations').trigger(:keyup)
         click_link '+'
         click_button 'Update'
         # reopen related citations listing