fast-follow - apply conflicts

Author: github-actions

WorkspaceStatic/jest/matchers/createConsoleMatcher.lua

@@ -1,8 +1,24 @@
+<<<<<<< HEAD
 --!nonstrict
 -- ROBLOX upstream: https://github.com/facebook/react/blob/6d50a9d090a2a672fc3dea5ce77a3a05332a6caa/fixtures/legacy-jsx-runtimes/setupTests.js
 local Packages = script.Parent.Parent.Parent.TestRunner
 local JestDiff = require(Packages.Dev.JestDiff)
 
+=======
+-- ROBLOX upstream: https://github.com/facebook/react/blob/v18.2.0/fixtures/legacy-jsx-runtimes/setupTests.js
+local Packages --[[ ROBLOX comment: must define Packages module ]]
+local LuauPolyfill = require(Packages.LuauPolyfill)
+local Array = LuauPolyfill.Array
+local Boolean = LuauPolyfill.Boolean
+local Error = LuauPolyfill.Error
+type Object = LuauPolyfill.Object
+local RegExp = require(Packages.RegExp)
+-- This is mostly copypasta from toWarnDev.js matchers
+-- that we use in the main repo Jest configuration.
+local expect = global.expect
+local jestDiff = require_("jest-diff").default
+local util = require_("util")
+>>>>>>> upstream-apply
 local function shouldIgnoreConsoleError(format, args)
 	-- deviation: instead of checking if `process.env.NODE_ENV ~= "production"`
 	-- we use the __DEV__ global
@@ -32,6 +48,7 @@ local function shouldIgnoreConsoleError(format, args)
 			-- // They are noisy too so we'll try to ignore them.
 			return true
 		end
+<<<<<<< HEAD
 		if
 			string.find(format, "act(...) is not supported in production builds of React")
 			== 0
@@ -43,6 +60,9 @@ local function shouldIgnoreConsoleError(format, args)
 		end
 	end
 
+=======
+	end -- Looks legit
+>>>>>>> upstream-apply
 	return false
 end
 

WorkspaceStatic/jest/matchers/reactTestMatchers.lua

@@ -1,5 +1,10 @@
+<<<<<<< HEAD
 -- ROBLOX upstream: https://github.com/facebook/react/blob/v17.0.2/scripts/jest/matchers/reactTestMatchers.js
 local Packages = script.Parent.Parent.Parent.TestRunner
+=======
+-- ROBLOX upstream: https://github.com/facebook/react/blob/v18.2.0/scripts/jest/matchers/reactTestMatchers.js
+local Packages --[[ ROBLOX comment: must define Packages module ]]
+>>>>>>> upstream-apply
 -- ROBLOX deviation START: fix import
 -- local LuauPolyfill = require(Packages.LuauPolyfill)
 local LuauPolyfill = require(Packages.Dev.LuauPolyfill)

WorkspaceStatic/jest/matchers/schedulerTestMatchers.lua

@@ -1,5 +1,10 @@
+<<<<<<< HEAD
 -- ROBLOX upstream: https://github.com/facebook/react/blob/v17.0.2/scripts/jest/matchers/schedulerTestMatchers.js
 local Packages = script.Parent.Parent.Parent.TestRunner
+=======
+-- ROBLOX upstream: https://github.com/facebook/react/blob/v18.2.0/scripts/jest/matchers/schedulerTestMatchers.js
+local Packages --[[ ROBLOX comment: must define Packages module ]]
+>>>>>>> upstream-apply
 -- ROBLOX deviation START: fix import
 -- local LuauPolyfill = require(Packages.LuauPolyfill)
 local LuauPolyfill = require(Packages.Dev.LuauPolyfill)

modules/jest-react/src/JestReact.lua

@@ -1,15 +1,21 @@
--- ROBLOX upstream: https://github.com/facebook/react/blob/v17.0.2/packages/jest-react/src/JestReact.js
+-- ROBLOX upstream: https://github.com/facebook/react/blob/v18.2.0/packages/jest-react/src/JestReact.js
 --[[*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  ]]
+<<<<<<< HEAD
 local LuauPolyfill = require("@pkg/@jsdotlua/luau-polyfill")
 local Array = LuauPolyfill.Array
+=======
+local Packages --[[ ROBLOX comment: must define Packages module ]]
+local LuauPolyfill = require(Packages.LuauPolyfill)
+>>>>>>> upstream-apply
 -- ROBLOX deviation START: not used
 -- local Boolean = LuauPolyfill.Boolean
 -- ROBLOX deviation END
+local Error = LuauPolyfill.Error
 local Object = LuauPolyfill.Object
 local exports = {}
 -- ROBLOX deviation START: fix import
@@ -23,13 +29,18 @@ local sharedReactSymbolsModule = require("@pkg/@jsdotlua/shared").ReactSymbols
 -- ROBLOX deviation END
 local REACT_ELEMENT_TYPE = sharedReactSymbolsModule.REACT_ELEMENT_TYPE
 local REACT_FRAGMENT_TYPE = sharedReactSymbolsModule.REACT_FRAGMENT_TYPE
+<<<<<<< HEAD
 -- ROBLOX deviation START: fix import
 -- local invariant = require("@pkg/@jsdotlua/shared").default
 local invariant = require("@pkg/@jsdotlua/shared").invariant
 -- ROBLOX deviation END
 -- ROBLOX deviation START: predeclare variables
 local jsonChildToJSXChild, jsonChildrenToJSXChildren
 -- ROBLOX deviation END
+=======
+local isArray = require(Packages.shared.isArray).default
+exports.act = require(script.Parent.internalAct).act
+>>>>>>> upstream-apply
 local function captureAssertion(fn)
 	-- Trick to use a Jest matcher inside another Jest matcher. `fn` contains an
 	-- assertion; if it throws, we capture the error and return it, so the stack
@@ -75,6 +86,7 @@ local function assertYieldsWereCleared(root)
 	-- local actualYields = Scheduler:unstable_clearYields()
 	local actualYields = Scheduler.unstable_clearYields()
 	-- ROBLOX deviation END
+<<<<<<< HEAD
 	invariant(
 		-- ROBLOX deviation START: fix .length
 		-- actualYields.length == 0,
@@ -83,6 +95,16 @@ local function assertYieldsWereCleared(root)
 		"Log of yielded values is not empty. "
 			.. "Call expect(ReactTestRenderer).unstable_toHaveYielded(...) first."
 	)
+=======
+	if actualYields.length ~= 0 then
+		error(
+			Error.new(
+				"Log of yielded values is not empty. "
+					.. "Call expect(ReactTestRenderer).unstable_toHaveYielded(...) first."
+			)
+		)
+	end
+>>>>>>> upstream-apply
 end
 local function unstable_toMatchRenderedOutput(root, expectedJSX)
 	assertYieldsWereCleared(root)
@@ -93,10 +115,14 @@ local function unstable_toMatchRenderedOutput(root, expectedJSX)
 	local actualJSX
 	if actualJSON == nil or typeof(actualJSON) == "string" then
 		actualJSX = actualJSON
+<<<<<<< HEAD
 		-- ROBLOX deviation START: remove toJSBoolean
 		-- elseif Boolean.toJSBoolean(Array.isArray(actualJSON)) then
 	elseif Array.isArray(actualJSON) then
 		-- ROBLOX deviation END
+=======
+	elseif Boolean.toJSBoolean(isArray(actualJSON)) then
+>>>>>>> upstream-apply
 		-- ROBLOX deviation START: fix .length
 		-- if actualJSON.length == 0 then
 		if #actualJSON == 0 then