tests adapted for authorization

2 files changed, 7 insertions, 4 deletions

diff --git a/features/step_definitions/lazar_steps.rb b/features/step_definitions/lazar_steps.rb
index 7ad2ebc..ae8c6b2 100644
--- a/features/step_definitions/lazar_steps.rb
+++ b/features/step_definitions/lazar_steps.rb
@@ -1,7 +1,8 @@
 When /^I create a lazar model for (.*)$/ do |feature_uri|
 	training_uri = @uri
 	#puts `curl #{training_uri}`
-	@uri = RestClient.post File.join(@@config[:services]["opentox-algorithm"], "lazar"), :dataset_uri => training_uri, :feature_uri => feature_uri, :feature_generation_uri => File.join(@@config[:services]["opentox-algorithm"], "fminer")
+  resource = RestClient::Resource.new(File.join(@@config[:services]["opentox-algorithm"], "lazar"), :user => @@users[:users].keys[0], :password => @@users[:users].values[0])	
+	@uri = resource.post :dataset_uri => training_uri, :feature_uri => feature_uri, :feature_generation_uri => File.join(@@config[:services]["opentox-algorithm"], "fminer")
 	@task = OpenTox::Task.find(@uri)
 	@resources << @uri
 	#puts @uri.to_yaml
@@ -11,7 +12,8 @@ Then /^the model should predict (.*) for (.*)$/ do |activity,smiles|
 	compound_uri = OpenTox::Compound.new(:smiles => smiles).uri
 	#puts @uri
 	#puts compound_uri
-	prediction = RestClient.post @uri, :compound_uri => compound_uri, :accept => "application/x-yaml"
+  resource = RestClient::Resource.new(@uri, :user => @@users[:users].keys[0], :password => @@users[:users].values[0])	
+	prediction = resource.post :compound_uri => compound_uri, :accept => "application/x-yaml"
 	model = Redland::Model.new Redland::MemoryStore.new
 	parser = Redland::Parser.new
 	parser.parse_string_into_model(model,prediction,'/')
diff --git a/features/step_definitions/task_steps.rb b/features/step_definitions/task_steps.rb
index 8e25dfe..1290350 100644
--- a/features/step_definitions/task_steps.rb
+++ b/features/step_definitions/task_steps.rb
@@ -1,10 +1,11 @@
 When /^I create a task$/ do
-	@uri = RestClient.post @@config[:services]["opentox-task"], nil
+  
+	@uri = RestClient::Resource.new(@@config[:services]["opentox-task"], :user => @@users[:users].keys[0], :password => @@users[:users].values[0]).post nil
 	@resources << @uri
 end
 
 When /^I finish the task for (.*)$/ do |resource|
-	RestClient.put File.join(@uri,"completed"), :resource => resource
+  RestClient::Resource.new(File.join(@uri,"completed"), :user => @@users[:users].keys[0], :password => @@users[:users].values[0]).put :resource => resource
 end