summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrautenberg <rautenberg@in-silico.ch>2013-07-27 23:06:07 +0200
committerrautenberg <rautenberg@in-silico.ch>2013-07-27 23:06:07 +0200
commit5da7653c8a4209f0623454567b527465b662483d (patch)
tree0474886e12bc44002d81b9e53f572c9075696c0d
parente1403f7083d07bda4353e8ca7d466956676c3e62 (diff)
fix toxbank-setup authentication
-rw-r--r--test/toxbank-setup.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/test/toxbank-setup.rb b/test/toxbank-setup.rb
index 198d9c3..d2de2a5 100644
--- a/test/toxbank-setup.rb
+++ b/test/toxbank-setup.rb
@@ -1,7 +1,10 @@
require_relative "setup.rb"
unless $aa[:uri].to_s == ""
- $pi[:subjectid] = OpenTox::Authorization.authenticate($pi[:name], $pi[:password])
- $secondpi[:subjectid] = OpenTox::Authorization.authenticate($secondpi[:name], $secondpi[:password])
+ OpenTox::Authorization.authenticate($pi[:name], $pi[:password])
+ $pi[:subjectid] = OpenTox::RestClientWrapper.subjectid
+ OpenTox::Authorization.authenticate($secondpi[:name], $secondpi[:password])
+ $secondpi[:subjectid] = OpenTox::RestClientWrapper.subjectid
unauthorized_error "Failed to authenticate user \"#{$aa[:user]}\"." unless OpenTox::Authorization.is_token_valid $pi[:subjectid]
unauthorized_error "Failed to authenticate user \"#{$aa[:user]}\"." unless OpenTox::Authorization.is_token_valid $secondpi[:subjectid]
+ OpenTox::Authorization.authenticate($aa[:user], $aa[:password])
end