merge master

spec/features/versions_spec.rb

@@ -373,7 +373,7 @@ feature 'Version' do
     EventsRegistration.create(registration: registration, event: event)
     EventsRegistration.first.update_attributes(attended: true)
     EventsRegistration.last.destroy
-    # Here registration is deleted to ensure the event registration related change still displays the asociated user's name
+    # Here registration is deleted to ensure the event registration related change still displays the associated user's name
     registration.destroy
 
     visit admin_revision_history_path

spec/models/conference_spec.rb

@@ -165,7 +165,7 @@ describe Conference do
   end
 
   describe '#get_submissions_data' do
-    it 'returns emtpy hash if there is no cfp or events' do
+    it 'returns empty hash if there is no cfp or events' do
       expect(subject.get_submissions_data).to eq []
     end
 

spec/spec_helper.rb

@@ -73,9 +73,11 @@ RSpec.configure do |config|
   end
 
   Capybara.register_driver :chrome_headless do |app|
-    options = Selenium::WebDriver::Chrome::Options.new(
-      args: %w(headless disable-gpu window-size=1920x1080 no-sandbox)
-    )
+    options = ::Selenium::WebDriver::Chrome::Options.new
+    options.args << '--window-size=1920x1080'
+    options.args << '--headless'
+    options.args << '--no-sandbox'
+    options.args << '--disable-gpu'
     Capybara::Selenium::Driver.new(app, browser: :chrome, options: options)
   end