all tests with :akephalos :envjs

1 files changed, 32 insertions, 34 deletions

diff --git a/toxcreate.rb b/toxcreate.rb
index dbad292..8d19bb4 100644
--- a/toxcreate.rb
+++ b/toxcreate.rb
@@ -4,11 +4,13 @@ require 'opentox-ruby'
 require 'test/unit'
 require 'akephalos'
 require 'capybara/dsl'
-#Capybara.default_driver = :akephalos # use this without visual inspection
-Capybara.default_driver = :selenium # use this for visual inspection
+require 'capybara/envjs'
+
+Capybara.default_driver = :akephalos # use this without visual inspection
+#Capybara.default_driver = :selenium # use this for visual inspection
 Capybara.run_server = false
 Capybara.default_wait_time = 1000
-#Capybara.javascript_driver = :selenium
+Capybara.javascript_driver = :envjs
 
 
 class ToxCreateTest < Test::Unit::TestCase
@@ -44,8 +46,6 @@ class ToxCreateTest < Test::Unit::TestCase
   end
 =end
   def test_02_toxcreate # works only with akephalos
-    Capybara.current_driver = :akephalos 
-    #login(@browser, @user, @password)
     visit CONFIG[:services]["opentox-toxcreate"]
     assert page.has_content?('Upload training data')
     attach_file('file', "./data/hamster_carcinogenicity.mini.csv")
@@ -59,27 +59,29 @@ class ToxCreateTest < Test::Unit::TestCase
     assert first(".model_status").has_content?("Completed")
   end
   
-  def test_03_predict # works only with selenium
-    Capybara.current_driver = :selenium
-    visit CONFIG[:services]["opentox-toxcreate"]
-    click_on "Predict"
-    fill_in "or enter a Name, InChI, Smiles, CAS, ...", :with => "NNc1ccccc1"
-    check "hamster_carcinogenicity"   
-    click_button "Predict"
-    assert page.has_content? "inactive"
-    click_on "Details"
-    #assert page.has_content? "false"
-    #assert page.has_content? "0.294"   
-    #assert page.has_content? "0.875"
+  def test_03_predict
+    Capybara.register_driver :akephalos do |app|
+      Capybara::Driver::Akephalos.new(app, :validate_scripts => false)
+    end
+    session = Capybara::Session.new(:akephalos)
+    session.visit CONFIG[:services]["opentox-toxcreate"]
+    session.click_on "Predict"
+    session.fill_in "or enter a Name, InChI, Smiles, CAS, ...", :with => "NNc1ccccc1"
+    session.check "hamster_carcinogenicity"
+    session.click_button("Predict")
+    session.click_on "Details"
+    assert session.has_content? "inactive"
+    #assert session.has_content? "false"
+    #assert session.has_content? "0.294"   
+    #assert session.has_content? "0.875"
   end
-=begin
-  def test_04_inspect_policies 
-    Capybara.current_driver = :selenium
+
+  def test_04_inspect_policies
     visit CONFIG[:services]["opentox-toxcreate"]
     click_on "Inspect"
     assert first('h2').has_content? 'hamster_carcinogenicity'
     click_on "edit"
-    click_on "manage policy"    
+    click_on "manage policy"
     within(:xpath, '//form[contains(@id, "form_policy_group_member_")]') do
       find(:xpath, './/input[5]').click
       click_on "update"
@@ -88,14 +90,12 @@ class ToxCreateTest < Test::Unit::TestCase
   end
   
   def test_05_inspect_policies
-    Capybara.current_driver = :selenium
     visit CONFIG[:services]["opentox-toxcreate"]
     click_on "Inspect"
     assert first('h2').has_content? 'hamster_carcinogenicity'
     click_on "edit"
     click_on "manage policy"
-  
-    within(:xpath, '//form[contains(@id, "form_policy_group_member_")]') do 
+    within(:xpath, '//form[contains(@id, "form_policy_group_member_")]') do
       find(:xpath, './/input[4]').click
       click_on "update"
     end
@@ -103,33 +103,31 @@ class ToxCreateTest < Test::Unit::TestCase
   end
   
   def test_06_inspect_policies
-    Capybara.current_driver = :selenium
     visit CONFIG[:services]["opentox-toxcreate"]
     click_on "Inspect"
     assert first('h2').has_content? 'hamster_carcinogenicity'
     click_on "edit"
-    click_on "manage policy"  
-    within(:xpath, '//form[contains(@id, "form_development")]') do 
-      find(:xpath, './/input[4]').click     
-      click_on "add" 
+    click_on "manage policy"
+    within(:xpath, '//form[contains(@id, "form_development")]') do
+      find(:xpath, './/input[4]').click
+      click_on "add"
     end
     sleep 5
   end
   
   def test_07_inspect_policies
-    Capybara.current_driver = :selenium
     visit CONFIG[:services]["opentox-toxcreate"]
     click_on "Inspect"
     assert first('h2').has_content? 'hamster_carcinogenicity'
     click_on "edit"
-    click_on "manage policy" 
-    within(:xpath, '//form[contains(@id, "form_policy_group_development_")]') do 
+    click_on "manage policy"
+    within(:xpath, '//form[contains(@id, "form_policy_group_development_")]') do
       find(:xpath, './/input[3]').click
       click_on "update"
     end
     sleep 5
-    page.evaluate_script('window.confirm = function() { return true; }')   
-    click_on "delete"   
+    page.evaluate_script('window.confirm = function() { return true; }')
+    click_on "delete"
   end
   
 =begin