upgrading selenium webdriver to version 2.18

Change-Id: I02c181e356da8598fc6f113613bc43d59ec77d4a
Reviewed-on: https://gerrit.instructure.com/8411
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Bryan Madsen <bryan@instructure.com>

Gemfile

@@ -71,7 +71,7 @@ group :test do
   gem 'rcov',         '0.9.9'
   gem 'rspec',        '1.3.2'
   gem 'rspec-rails',  '1.3.4'
-  gem 'selenium-webdriver', '2.17.0'
+  gem 'selenium-webdriver', '2.18.0'
   gem 'webrat',       '0.7.3'
   gem 'yard',         '0.7.2'
 end

spec/selenium/content_migrations_spec.rb

@@ -42,12 +42,9 @@ describe "external migrations" do
 
     filename, fullpath, data = get_file("cc_full_test.zip")
 
-    driver.find_element(:css, '#choose_migration_system').
-            find_element(:css, 'option[value="common_cartridge_importer"]').click
-    driver.find_element(:css, '#config_options').
-            find_element(:name, 'export_file').send_keys(fullpath)
-    driver.find_element(:css, '#config_options').
-            find_element(:css, '.submit_button').click
+    click_option('#choose_migration_system', 'Common Cartridge 1.0/1.1/1.2 Package')
+    driver.find_element(:css, '#config_options').find_element(:name, 'export_file').send_keys(fullpath)
+    driver.find_element(:css, '#config_options').find_element(:css, '.submit_button').click
     keep_trying_until { driver.find_element(:css, '#file_uploaded').displayed? }
 
     ContentMigration.for_context(@course).count.should == 1

spec/selenium/quizzes_spec.rb

@@ -924,7 +924,7 @@ describe "quizzes" do
     #This step is to prevent selenium from freezing when the dialog appears when leaving the page
     driver.find_element(:link, I18n.t('links_to.quizzes', 'Quizzes')).click
     confirm_dialog = driver.switch_to.alert
-    expect_new_page_load { confirm_dialog.accept }
+    confirm_dialog.accept
   end
 
   it "should round numeric questions the same when created and taking a quiz" do
@@ -990,7 +990,7 @@ describe "quizzes" do
       #This step is to prevent selenium from freezing when the dialog appears when leaving the page
       driver.find_element(:link, 'Quizzes').click
       confirm_dialog = driver.switch_to.alert
-      expect_new_page_load { confirm_dialog.accept }
+      confirm_dialog.accept
     end
 
     # see blur.unhoverQuestion in take_quiz.js. avoids a windows chrome display glitch