Merge "Revert "[Browser test] Reintroduce headless browser test support""

This commit is contained in:
jenkins-bot 2014-02-07 01:54:42 +00:00 committed by Gerrit Code Review
commit 527d432161
2 changed files with 17 additions and 15 deletions

View file

@ -19,31 +19,29 @@ GEM
ffi (1.9.3) ffi (1.9.3)
gherkin (2.12.2) gherkin (2.12.2)
multi_json (~> 1.3) multi_json (~> 1.3)
headless (1.0.1)
i18n (0.6.9) i18n (0.6.9)
json (1.8.1) json (1.8.1)
mediawiki-selenium (0.1.20) mediawiki-selenium (0.1.17)
cucumber (~> 1.3.10) cucumber
headless (~> 1.0.1) json
json (~> 1.8.1) net-http-persistent
net-http-persistent (~> 2.9.1) page-object
page-object (~> 0.9.5) rest-client
rest-client (~> 1.6.7) rspec-expectations
rspec-expectations (~> 2.14.4) syntax
syntax (~> 1.2.0)
mime-types (2.1) mime-types (2.1)
multi_json (1.8.4) multi_json (1.8.4)
multi_test (0.0.3) multi_test (0.0.3)
net-http-persistent (2.9.2) net-http-persistent (2.9.1)
page-object (0.9.6) page-object (0.9.5)
page_navigation (>= 0.9) page_navigation (>= 0.9)
selenium-webdriver (>= 2.39.0) selenium-webdriver (>= 2.39.0)
watir-webdriver (>= 0.6.7) watir-webdriver (>= 0.6.4)
page_navigation (0.9) page_navigation (0.9)
data_magic (>= 0.14) data_magic (>= 0.14)
rest-client (1.6.7) rest-client (1.6.7)
mime-types (>= 1.16) mime-types (>= 1.16)
rspec-expectations (2.14.5) rspec-expectations (2.14.4)
diff-lcs (>= 1.1.3, < 2.0) diff-lcs (>= 1.1.3, < 2.0)
rubyzip (1.1.0) rubyzip (1.1.0)
selenium-webdriver (2.39.0) selenium-webdriver (2.39.0)
@ -52,7 +50,7 @@ GEM
rubyzip (~> 1.0) rubyzip (~> 1.0)
websocket (~> 1.0.4) websocket (~> 1.0.4)
syntax (1.2.0) syntax (1.2.0)
watir-webdriver (0.6.7) watir-webdriver (0.6.4)
selenium-webdriver (>= 2.18.0) selenium-webdriver (>= 2.18.0)
websocket (1.0.7) websocket (1.0.7)
yml_reader (0.2) yml_reader (0.2)

View file

@ -1,3 +1,7 @@
at_exit do
$browser.close unless ENV["KEEP_BROWSER_OPEN"] == "true"
end
#This is for the Headings test #This is for the Headings test
Before("@edit_user_page") do Before("@edit_user_page") do
if (!$edit_user_page or !(ENV["REUSE_BROWSER"] == "true")) and @browser if (!$edit_user_page or !(ENV["REUSE_BROWSER"] == "true")) and @browser