sus 0.20.0 → 0.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32d3a31b1ef9a5f80523b6d3bbe34d8fe1312fbee9f48b96eff16ee0c7755b46
-  data.tar.gz: 7fe132541184eb203cd93f1bb5f94288c473a70d0329b1a351d7bd70be382e41
+  metadata.gz: abff2f6428b5b2a3b86b3ad54d32d73f9b78bf58cd1f81bf010cc7593e1c4bc2
+  data.tar.gz: 4fb6c173ac38b1c2e2053867d7f8ec768a9cfdd90ddfa8db366ef4af799a3211
 SHA512:
-  metadata.gz: 451fa9e5cc095f4af36347f0fc5f55ffbd74ce1b03efa6985cacbcdd2aa469ec577aadc8c6fe4d197e7f323bdd7ae18ca318c2cc1861568abe2b1230525a078f
-  data.tar.gz: 6d9ae7c5173b87ac726f3e61b13ae3ca199adf73cb86bba9f9e2326cacc064ea395a692288d97a3898fb7ff7500ad8581303a8d3331813fd8bfd04c3665a0da6
+  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 ||= self.output.string
 			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.0"
+	VERSION = "0.20.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sus
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.20.2
 platform: ruby
 authors:
 - Samuel Williams
@@ -38,7 +38,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2023-02-24 00:00:00.000000000 Z
+date: 2023-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bake-test