barthes 0.0.11 → 0.0.12

data/lib/barthes/action.rb

@@ -13,42 +13,56 @@ module Barthes
 		end
 
 		def action(action)
-			@env.update(action['env']) if action['env']
-			params = evaluate_params(action['params'])
+			begin
+				@env.update(action['env']) if action['env']
+				params = evaluate_params(action['params'])
 
-			if action['expectations']
-				if action['max_loop']
-					action['max_loop'].to_i.times do
-						sleep action['sleep'].to_i/1000 if action['sleep']	
+				if action['expectations']
+					if action['max_loop']
+						action['max_loop'].to_i.times do
+							sleep action['sleep'].to_i/1000 if action['sleep']	
 
-						response = @client.action(params)
-						action['expectations'].each do |expectation|
-							result = @client.compare(response, evaluate_params(expectation))
-							expectation.update(result)
-						end
-						if action['expectations'].all? {|e| e['result'] == true }
-							break
+							response = @client.action(params)
+							action['expectations'].each do |expectation|
+								result = @client.compare(response, evaluate_params(expectation))
+								expectation.update(result)
+							end
+							if action['expectations'].all? {|e| e['result'] == true }
+								break
+							end
 						end
 					end
 				end
-			end
 
-			sleep action['sleep'].to_i/1000 if action['sleep']	
+				sleep action['sleep'].to_i/1000 if action['sleep']	
 
-			action['request'] = params
-			action['response'] = response = @client.action(params)
+				action['request'] = params
+				action['response'] = response = @client.action(params)
 
-			if action['expectations']
-				action['expectations'].each do |expectation|
-					result = @client.compare(response, evaluate_params(expectation))
-					expectation.update(result)
+				if action['expectations']
+					action['expectations'].each do |expectation|
+						result = @client.compare(response, evaluate_params(expectation))
+						expectation.update(result)
+					end
+					if action['expectations'].all? {|e| e['result'] == true }
+						action['status'] = 'failure'
+					end
+				else
+					action['status'] = 'success'
 				end
-			end
 
-			if cache_config = action['cache']
-				value = @client.extract(cache_config, response)
-				action['cache']['value'] = value
-				Barthes::Cache[cache_config['key']] = value
+				if cache_config = action['cache']
+					value = @client.extract(cache_config, response)
+					action['cache']['value'] = value
+					Barthes::Cache[cache_config['key']] = value
+				end
+			rescue StandardError => e
+				action['status'] = 'error'
+				action['error'] = {
+					'class' => e.class,
+					'message' => e.message,
+					'backtrace' => e.backtrace
+				}
 			end
 			action
 		end

data/lib/barthes/reporter/junit_xml.rb

@@ -57,7 +57,20 @@ module Barthes
 						when 'skipped'
 							@xml.skipped
 						when 'failure'
+							failure = "failed expectations: \n"
+							expectations = action['expectations'] || []
+							expectations.each do |expectation|
+								if expectation['result'] == false
+									failure += JSON.pretty_generate(expectation) + "\n"
+								end
+							end
+							@xml.failure failure
 						when 'error'
+							error = "error:\n"
+							error += "class: #{json.last['error']['class']}\n"
+							error += "message: #{json.last['error']['message']}\n"
+							error += "backtrace: #{json.last['error']['backtrace'].join("\n")}\n"
+							@xml.error error
 						end
 						if json.last['status'] != 'skipped' && json.last['request'] && json.last['response']
 							stdout = "request:\n"

data/lib/barthes/runner.rb

@@ -111,9 +111,7 @@ module Barthes
 				content['number'] = @num
 				if Barthes::Config[:dryrun] == 0 && !@failed
 					content = Action.new(env).action(content)
-					if content['expectations'] && content['expectations'].any? {|e| e['result'] == false }
-						@failed = true
-					end
+					@failed = true if %w(failure error).include?(content['status'])
 				end
 				content['status'] = 'skipped' if Barthes::Config[:dryrun] > 0
 				content

data/lib/barthes/version.rb

@@ -1,3 +1,3 @@
 module Barthes
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: barthes
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors: