summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgebele <gebele@alfadeo.de>2011-07-15 16:09:30 +0200
committergebele <gebele@alfadeo.de>2011-07-15 16:09:30 +0200
commit15d3b730b1181996c16835ae7fddb71d2163ac48 (patch)
tree7f5136e7c97a47d9c0dd50d20525e57ddb9bb6ce
parent728b8c6846d527ceb787fdd7116c60be9d805272 (diff)
fixed syntax after bad merge process; test 02 to 07 running without errors
-rw-r--r--toxcreate.rb16
1 files changed, 7 insertions, 9 deletions
diff --git a/toxcreate.rb b/toxcreate.rb
index a051fcc..7e37566 100644
--- a/toxcreate.rb
+++ b/toxcreate.rb
@@ -132,7 +132,7 @@ class ToxCreateTest < Test::Unit::TestCase
#page.evaluate_script('window.confirm = function() { return true; }')
click_on "delete"
end
-
+=begin
def test_08_multi_cell_call
#login(@browser, @user, @password)
Capybara.current_driver = :akephalos
@@ -161,14 +161,12 @@ class ToxCreateTest < Test::Unit::TestCase
attach_file('file', "./data/multi_cell_call.csv")
click_on "Create model"
end
+
+ def login(browser, user, password)
+ browser.goto File.join(CONFIG[:services]["opentox-toxcreate"], "login")
+ browser.text_field(:id, "username").set(user)
+ browser.text_field(:id, "password").set(password)
+ browser.button(:value, "Login").click
end
=end
-=begin
-def login(browser, user, password)
- browser.goto File.join(CONFIG[:services]["opentox-toxcreate"], "login")
- browser.text_field(:id, "username").set(user)
- browser.text_field(:id, "password").set(password)
- browser.button(:value, "Login").click
-end
-=end
end