sus 0.20.1 → 0.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea560192a54c0bedbc466fceb371a10e6606fd1ba0e0ac454fcefefb2c2437bc
-  data.tar.gz: 944a2b68b7d167d7900d628d9e8d9abb39b1f50b1722371f23d6794ad42f493c
+  metadata.gz: abff2f6428b5b2a3b86b3ad54d32d73f9b78bf58cd1f81bf010cc7593e1c4bc2
+  data.tar.gz: 4fb6c173ac38b1c2e2053867d7f8ec768a9cfdd90ddfa8db366ef4af799a3211
 SHA512:
-  metadata.gz: be6279ef1448ff76043b78f7e70e18ff7f4bf7638339f7b955cc6d69f9dbe7ec86899aa6f93a519b377a6bbe449c27f21958d8bfbf5409477ca492b102c4fe14
-  data.tar.gz: 7ef1abdf110295d84738a312854b8a086df4892b3abe8878d67d9408a166a07fb5298c5b5a4c72199f8338f8337c371966daa98fad8fedc2bc9ee32bd8c3ff1b
+  metadata.gz: 23f742731558ca0bb9b3a2a09bc3fb01a6f5d8fb2af4309c41d750866f3e3a9f25be059f1c186670132b1eeafb7896d40262cec04c20d0f8c41e2b73b9255136
+  data.tar.gz: e1e4ba8a789c2ca7c1c8391e975499185a0860afc738c3fc0b94dc380c3d22434daef20a0992a07179740f5568afb88a0dda4ef97c1485e96af56ac67d2cce57

data/lib/sus/assertions.rb

@@ -147,13 +147,13 @@ module Sus
 		end
 		
 		class Assert
-			def initialize(identity, message)
+			def initialize(identity, assertions)
 				@identity = identity
-				@message = message
+				@assertions = assertions
 			end
 			
 			attr :identity
-			attr :message
+			attr :assertions
 			
 			def each_failure(&block)
 				yield self
@@ -161,7 +161,7 @@ module Sus
 			
 			def message
 				{
-					text: @message,
+					text: assertions.output.string,
 					location: @identity&.to_location
 				}
 			end
@@ -170,21 +170,20 @@ module Sus
 		def assert(condition, message = nil)
 			@count += 1
 			
-			message ||= "Assertion"
 			backtrace = Output::Backtrace.first(@identity)
 			identity = @identity&.scoped
 			
 			if condition
-				@passed << Assert.new(identity, message)
+				@passed << Assert.new(identity, self)
 				
 				if !@orientation || @verbose
-					@output.puts(:indent, *pass_prefix, message, backtrace)
+					@output.puts(:indent, *pass_prefix, message || "assertion passed", backtrace)
 				end
 			else
-				@failed << Assert.new(identity, message)
+				@failed << Assert.new(identity, self)
 				
 				if @orientation || @verbose
-					@output.puts(:indent, *fail_prefix, message, backtrace)
+					@output.puts(:indent, *fail_prefix, message || "assertion failed", backtrace)
 				end
 			end
 		end

data/lib/sus/raise_exception.rb

@@ -26,7 +26,7 @@ module Sus
 				rescue @exception_class => exception
 					# Did it have the right message?
 					if @message
-						@message.call(assertions, exception.message)
+						Expect.new(assertions, exception.message).to(@message)
 					else
 						assertions.assert(true, "raised")
 					end

data/lib/sus/version.rb

@@ -4,5 +4,5 @@
 # Copyright, 2021-2022, by Samuel Williams.
 
 module Sus
-	VERSION = "0.20.1"
+	VERSION = "0.20.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sus
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.20.2
 platform: ruby
 authors:
 - Samuel Williams