barthes 0.0.12 → 0.0.13

data/lib/barthes/action.rb

@@ -39,13 +39,15 @@ module Barthes
 				action['request'] = params
 				action['response'] = response = @client.action(params)
 
-				if action['expectations']
+				if action['expectations'] && !action['expectations'].empty?
 					action['expectations'].each do |expectation|
 						result = @client.compare(response, evaluate_params(expectation))
 						expectation.update(result)
 					end
-					if action['expectations'].all? {|e| e['result'] == true }
+					if !action['expectations'].all? {|e| e['result'] == true }
 						action['status'] = 'failure'
+					else
+						action['status'] = 'success'
 					end
 				else
 					action['status'] = 'success'

data/lib/barthes/reporter/default.rb

@@ -25,8 +25,16 @@ module Barthes
 				if Barthes::Config[:quiet] == 0 && Barthes::Config[:dryrun] == 0
 					puts indent scenarios.size + 1, "request:"
 					puts indent scenarios.size + 2, JSON.pretty_generate(action['request'])
-					puts indent scenarios.size + 1, "response:"
-					puts indent scenarios.size + 2, JSON.pretty_generate(action['response'])
+					if %w(success failure).include?(action['status'])
+						puts indent scenarios.size + 1, "response:"
+						puts indent scenarios.size + 2, JSON.pretty_generate(action['response'])
+					elsif action['status'] == 'error'
+						puts indent scenarios.size + 1, "error:"
+						puts indent scenarios.size + 2, "class: #{action['error']['class']}"
+						puts indent scenarios.size + 2, "message: #{action['error']['message']}"
+						puts indent scenarios.size + 2, "backtrace:"
+						puts indent scenarios.size + 3, action['error']['backtrace'].join("\n")
+					end
 				end
 				expectations = action['expectations'] || []
 				expectations.each do |expectation|
@@ -38,10 +46,10 @@ module Barthes
 				flag = ''
 				if Barthes::Config[:dryrun] > 0
 					flag = 'skipped'
-				elsif expectations.empty? || expectations.all? {|r| r['result'] == true }
-					flag = green {'success'}
+				elsif action['status'] == 'success'
+					flag = green { action['status'] }
 				else
-					flag = red {'failure'}
+					flag = red { action['status'] }
 				end
 				puts indent(scenarios.size + 1, "result: #{flag}")
 			end

data/lib/barthes/reporter/junit_xml.rb

@@ -58,7 +58,7 @@ module Barthes
 							@xml.skipped
 						when 'failure'
 							failure = "failed expectations: \n"
-							expectations = action['expectations'] || []
+							expectations = json.last['expectations'] || []
 							expectations.each do |expectation|
 								if expectation['result'] == false
 									failure += JSON.pretty_generate(expectation) + "\n"

data/lib/barthes/version.rb

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

metadata

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