Merge branch 'development' of ssh://github.com/opentox/opentox-test into development

4 files changed, 15 insertions, 12 deletions

diff --git a/opentox-test.gemspec b/opentox-test.gemspec
index 60a6395..c32c132 100644
--- a/opentox-test.gemspec
+++ b/opentox-test.gemspec
@@ -18,8 +18,8 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'minitest'
   gem.add_runtime_dependency "opentox-client"
-  #gem.add_runtime_dependency 'capybara', "= 2.1.0"
-  #gem.add_runtime_dependency 'capybara-webkit', "= 1.0.0"
+  gem.add_runtime_dependency 'capybara'#, "= 2.1.0"
+  gem.add_runtime_dependency 'capybara-webkit'#, "= 1.0.0"
   gem.post_install_message = "Please configure test in ~/.opentox/config/test.rb"
 
 end
diff --git a/test/aop-curl.rb b/test/aop-curl.rb
index 356f2d8..5762796 100644
--- a/test/aop-curl.rb
+++ b/test/aop-curl.rb
@@ -30,13 +30,13 @@ class JsonTest < MiniTest::Test
     result = JSON[response]
     #puts result
     aid = result.collect{|x| x['AID']}
-    assert_includes aid.to_s, "651645"
+    assert_includes aid.to_s, "42314"
     p_active = result.collect{|x| x['p_active']}
     assert_includes p_active.to_s, "0.9701425001453319"
     p_inactive = result.collect{|x| x['p_inactive']}
     assert_includes p_inactive.to_s, "0.029857499854668124"
     assay_name = result.collect{|x| x['Assay Name']}
-    assert_includes assay_name.to_s, "Cell Proliferation Assay against the TMD8 Cell Line"
+    assert_includes assay_name.to_s, "Ability to inhibit [3H]-PK 11195 binding to peripheral-type benzodiazepine receptor(PBR) in rat cerebral cortex homogenate."
   end
 
 end
diff --git a/test/aopweb.rb b/test/aopweb.rb
index 04b03e4..82156f9 100644
--- a/test/aopweb.rb
+++ b/test/aopweb.rb
@@ -1,4 +1,3 @@
-=begin
 require_relative "setup.rb"
 require 'capybara'
 require 'capybara-webkit'
@@ -58,4 +57,3 @@ class LazarWebTest < MiniTest::Test
   end
 
 end
-=end
diff --git a/test/lazarweb.rb b/test/lazarweb.rb
index 314b1ec..90e1292 100644
--- a/test/lazarweb.rb
+++ b/test/lazarweb.rb
@@ -1,4 +1,3 @@
-=begin
 require_relative "setup.rb"
 require 'capybara'
 require 'capybara-webkit'
@@ -12,7 +11,14 @@ Capybara.default_driver = :webkit
 Capybara.default_wait_time = 20
 Capybara.javascript_driver = :webkit
 Capybara.run_server = false
-Capybara.app_host = 'https://services.in-silico.ch'
+Capybara.app_host =$lazar_gui[:uri] 
+
+begin
+  puts "Service URI is: #{$lazar_gui[:uri]}"
+rescue
+  puts "Configuration Error: $aop[:uri] is not defined in: " + File.join(ENV["HOME"],".opentox","config","test.rb")
+  exit
+end
 
 class LazarWebTest < MiniTest::Test
   i_suck_and_my_tests_are_order_dependent!
@@ -38,7 +44,7 @@ class LazarWebTest < MiniTest::Test
 
   def test_03_check_all_links_exists
     visit('/')
-    links = ['Details', 'SMILES', 'in-silico toxicology gmbh']
+    links = ["Details", "SMILES", "toxicology gmbh 2004 - #{Time.now.year.to_s}"]
     links.each{|l| puts l.to_s; assert page.has_link?(l), "true"}
   end
 
@@ -54,7 +60,7 @@ class LazarWebTest < MiniTest::Test
     assert page.has_content?('Neighbors'), "true"
     assert page.has_link?('Significant fragments'), "true"
     assert page.has_link?('v'), "true"
-    # open sf view
+    # open 'significant fragments' view
     find_link('linkPredictionSf').click
     sleep 5
     within_frame('details_overview') do
@@ -79,7 +85,7 @@ class LazarWebTest < MiniTest::Test
       # active
       assert page.has_content?('[#7&A]-[#7&A]'), "true"
       assert page.has_content?('0.99993'), "true"
-      # close sf view
+      # close 'significant fragments' view
       find_button('closebutton').click
     end
     find_link('link0').click
@@ -105,4 +111,3 @@ class LazarWebTest < MiniTest::Test
   end
 
 end
-=end