From c10b404097d897917c6217e98f3cb33775e1c325 Mon Sep 17 00:00:00 2001
From: Jake Sorce <jake@instructure.com>
Date: Fri, 20 Jan 2012 15:42:41 -0700
Subject: [PATCH] upgrade to selenium 2.17 webdriver

Change-Id: I896f70f81a97ab3e9a3c2399aa17c420f72c1c54
Reviewed-on: https://gerrit.instructure.com/8206
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Ryan Shaw <ryan@instructure.com>
---
 Gemfile                             | 2 +-
 spec/selenium/outcome_spec.rb       | 4 ++--
 spec/selenium/wiki_and_tiny_spec.rb | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index a71de29812f..cfa4fee3ad7 100644
--- a/Gemfile
+++ b/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.15.0'
+  gem 'selenium-webdriver', '2.17.0'
   gem 'webrat',       '0.7.3'
   gem 'yard',         '0.7.2'
 end
diff --git a/spec/selenium/outcome_spec.rb b/spec/selenium/outcome_spec.rb
index a7a549f96de..4554d45928f 100644
--- a/spec/selenium/outcome_spec.rb
+++ b/spec/selenium/outcome_spec.rb
@@ -121,8 +121,8 @@ describe "learning outcome test" do
     wait_for_ajaximations
     driver.find_element(:css, '#rubrics .edit_rubric_link img').should be_displayed
     find_all_with_jquery('#rubrics tr.criterion:visible').size.should == 4
-    driver.find_element(:css, '#left-side .outcomes').click
-    driver.find_element(:link, "Outcomes").click
+    expect_new_page_load { driver.find_element(:css, '#left-side .outcomes').click }
+    expect_new_page_load { driver.find_element(:link, "Outcomes").click }
     find_with_jquery('#right-side a:last-child').click
     driver.find_element(:css, '#rubrics .details').should include_text('15')
   end
diff --git a/spec/selenium/wiki_and_tiny_spec.rb b/spec/selenium/wiki_and_tiny_spec.rb
index 14854334afb..68a61638ac2 100644
--- a/spec/selenium/wiki_and_tiny_spec.rb
+++ b/spec/selenium/wiki_and_tiny_spec.rb
@@ -183,7 +183,7 @@ describe "Wiki pages and Tiny WYSIWYG editor" do
         end
         [:width, :color].each do |part|
           [:top, :right, :bottom, :left].each do |side|
-            expected_value = attributes[{:width => :border, :color => :bordercolor}[part]] || {:width => 1, :color => '#888888'}[part]
+            expected_value = attributes[{:width => :border, :color => :bordercolor}[part]] || {:width => 1, :color => 'rgb(136, 136, 136)'}[part]
             if expected_value.is_a?(Numeric)
               expected_value = 1 if expected_value == 0
               expected_value = "#{expected_value}px"
@@ -205,7 +205,7 @@ describe "Wiki pages and Tiny WYSIWYG editor" do
         :cellpadding => 5,
         :cellspacing => 6,
         :border => 7,
-        :bordercolor => '#ff0000'
+        :bordercolor => 'rgb(255, 0, 0)'
     )
     check_table(
         :align => 'center',