ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Jake Sorce 2012-01-31 16:25:58 -07:00
parent c7969a2368
commit 4540b032b2
3 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

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

9
spec/selenium/content_migrations_spec.rb
View File

@ -42,12 +42,9 @@ describe "external migrations" do
filename, fullpath, data = get_file("cc_full_test.zip") filename, fullpath, data = get_file("cc_full_test.zip")
driver.find_element(:css, '#choose_migration_system'). click_option('#choose_migration_system', 'Common Cartridge 1.0/1.1/1.2 Package')
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'). driver.find_element(:css, '#config_options').find_element(:css, '.submit_button').click
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? } keep_trying_until { driver.find_element(:css, '#file_uploaded').displayed? }
ContentMigration.for_context(@course).count.should == 1 ContentMigration.for_context(@course).count.should == 1

4
spec/selenium/quizzes_spec.rb
View File

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