change fixed variables to globals in test.rb configuration file

1 files changed, 7 insertions, 4 deletions

diff --git a/test/setup.rb b/test/setup.rb
index c63a17c..b035a80 100644
--- a/test/setup.rb
+++ b/test/setup.rb
@@ -4,8 +4,11 @@ Bundler.require
 require 'opentox-client'
 require File.join(ENV["HOME"],".opentox","config","test.rb")
 
-if defined? $aa
-  @@subjectid = OpenTox::Authorization.authenticate($aa[:user], $aa[:password])
-else
-  @@subjectid = ""
+begin
+  AA = $aa[:uri]
+  @@subjectid = OpenTox::Authorization.authenticate($aa[:user],$aa[:password])
+  raise if !OpenTox::Authorization.is_token_valid(@@subjectid)
+rescue
+  puts "Configuration Error: $aa[:uri], $aa[:user] or $aa[:password] are not defined in: " + File.join(ENV["HOME"],".opentox","config","test.rb")
+  exit
 end