Merge branch 'master' of github.com:hyoo-ru/mam_mol into fix-run

hyoo-ru · Nov 26, 2024 · 237a60e · 237a60e
2 parents 84c1e4a + 93fae5c
commit 237a60e
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 9 deletions.
diff --git a/portion/portion.view.tree b/portion/portion.view.tree
@@ -6,5 +6,5 @@ $mol_portion_indicator $mol_view
 $mol_portion $mol_view
 	portion 0
 	sub /
-		<= indicator $mol_portion_indicator
+		<= Indicator $mol_portion_indicator
 			width_style <= indicator_width_style \0
diff --git a/state/arg/arg.web.test.ts b/state/arg/arg.web.test.ts
@@ -8,6 +8,11 @@ namespace $ {
 			@ $mol_mem
 			static href( next? : string ) { return next || '' }
 
+			@ $mol_action
+			static go( next : { [ key : string ] : string | null } ) {
+				this.href( this.link( next ) )
+			}
+
 		}
 		context.$mol_state_arg = $mol_state_arg_mock
 	} )
@@ -17,7 +22,7 @@ namespace $ {
 		'args as dictionary'( $ ) {
 
 			$.$mol_state_arg.href( '#!foo=bar/xxx' )
-			$mol_assert_like( $.$mol_state_arg.dict() , { foo : 'bar' , xxx : '' } )
+			$mol_assert_equal( $.$mol_state_arg.dict() , { foo : 'bar' , xxx : '' } )
 
 			$.$mol_state_arg.dict({ foo : null , yyy : '' , lol : '123' })
 			$mol_assert_equal( $.$mol_state_arg.href().replace( /.*#/ , '#' ) , '#!yyy/lol=123' )

diff --git a/wait/rest/rest.test.ts b/wait/rest/rest.test.ts
@@ -0,0 +1,8 @@
+namespace $.$$ {
+
+	$mol_test_mocks.push( $ => {
+		$.$mol_wait_timeout = function $mol_wait_timeout_mock( this: $, timeout: number ) { }
+		$.$mol_wait_timeout_async = async function $mol_wait_timeout_async_mock( this: $, timeout: number ) {}
+	} )
+
+}
diff --git a/wait/timeout/timeout.test.ts b/wait/timeout/timeout.test.ts
@@ -0,0 +1,8 @@
+namespace $.$$ {
+
+	$mol_test_mocks.push( $ => {
+		$.$mol_wait_rest = function $mol_wait_rest_mock( this: $ ) { }
+		$.$mol_wait_rest_async = async function $mol_wait_rest_async_mock( this: $ ) {}
+	} )
+
+}
diff --git a/wait/timeout/timeout.ts b/wait/timeout/timeout.ts
@@ -1,6 +1,6 @@
 namespace $ {
 
-	export function $mol_wait_timeout_async( this: $, timeout: number ) {
+	export function $mol_wait_timeout_async( this: $, timeout: number ): Promise< void > {
 		const promise = $mol_promise()
 		const task = new this.$mol_after_timeout( timeout , ()=> promise.done() )
 		return Object.assign( promise, {

diff --git a/wire/async/async.test.ts b/wire/async/async.test.ts
@@ -25,7 +25,7 @@ namespace $ {
 
 				static send( next: string ) {
 					$mol_wire_sync( this.first ).push( next )
-					this.$.$mol_wait_timeout(0)
+					$$.$mol_wait_timeout(0)
 					this.last.push( next )
 				}
 
@@ -39,8 +39,8 @@ namespace $ {
 			$.$mol_after_mock_warp()
 			await promise
 
-			$mol_assert_like( NameLogger.first, [ 'john', 'jin' ] )
-			$mol_assert_like( NameLogger.last, [ 'jin' ] )
+			$mol_assert_equal( NameLogger.first, [ 'john', 'jin' ] )
+			$mol_assert_equal( NameLogger.last, [ 'jin' ] )
 
 		},
 
@@ -51,7 +51,7 @@ namespace $ {
 
 			function send_name( next: string ) {
 				$mol_wire_sync( first ).push( next )
-				$.$mol_wait_timeout(0)
+				$$.$mol_wait_timeout(0)
 				last.push( next )
 			}
 
@@ -63,8 +63,8 @@ namespace $ {
 			$.$mol_after_mock_warp()
 			await promise
 
-			$mol_assert_like( first, [ 'john', 'jin' ] )
-			$mol_assert_like( last, [ 'jin' ] )
+			$mol_assert_equal( first, [ 'john', 'jin' ] )
+			$mol_assert_equal( last, [ 'jin' ] )
 
 		},