Skip to content

Commit 4df121e

Browse files
jeparlefrancaisjeparlefrancais
committed
Refactor requires
1 parent 0a3ac87 commit 4df121e

26 files changed

+113
-180
lines changed

‎src/.robloxrc‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎src/__tests__/act.spec.lua‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
-- ROBLOX upstream: https://github.com/testing-library/react-testing-library/blob/v12.1.5/src/__tests__/act.js
2-
local Packages = script.Parent.Parent.Parent
3-
4-
local JestGlobals = require(Packages.JestGlobals)
2+
local JestGlobals = require("@pkg/@jsdotlua/jest-globals")
53
local expect = JestGlobals.expect
64
local test = JestGlobals.test
75
local jest = JestGlobals.jest
86

9-
local React = require(Packages.React)
10-
local ParentModule = require(script.Parent.Parent)
7+
local ParentModule = require("..")
8+
local React = require("@pkg/@jsdotlua/react")
119
local render = ParentModule.render
1210
local fireEvent = ParentModule.fireEvent
1311
local screen = ParentModule.screen

‎src/__tests__/auto-cleanup-skip.spec.lua‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
-- ROBLOX upstream: https://github.com/testing-library/react-testing-library/blob/v12.1.5/src/__tests__/auto-cleanup-skip.js
2-
local Packages = script.Parent.Parent.Parent
3-
4-
local JestGlobals = require(Packages.JestGlobals)
2+
local JestGlobals = require("@pkg/@jsdotlua/jest-globals")
53
local expect = JestGlobals.expect
64
local test = JestGlobals.test
75
local beforeAll = JestGlobals.beforeAll
86
local afterAll = JestGlobals.afterAll
97

10-
local document = require(Packages.DomTestingLibrary).document
8+
local document = require("@pkg/@jsdotlua/dom-testing-library").document
119

12-
local React = require(Packages.React)
10+
local React = require("@pkg/@jsdotlua/react")
1311
local render, cleanup
1412
beforeAll(function()
1513
_G.RTL_SKIP_AUTO_CLEANUP = "true"
16-
local rtl = require(script.Parent.Parent)
14+
local rtl = require("..")
1715
render = rtl.render
1816
-- ROBLOX deviation START: force cleanup
1917
cleanup = rtl.cleanup

‎src/__tests__/auto-cleanup.spec.lua‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
-- ROBLOX upstream: https://github.com/testing-library/react-testing-library/blob/v12.1.5/src/__tests__/auto-cleanup.js
2-
local Packages = script.Parent.Parent.Parent
3-
4-
local JestGlobals = require(Packages.JestGlobals)
2+
local JestGlobals = require("@pkg/@jsdotlua/jest-globals")
53
local expect = JestGlobals.expect
64
local test = JestGlobals.test
75

8-
local document = require(Packages.DomTestingLibrary).document
6+
local document = require("@pkg/@jsdotlua/dom-testing-library").document
97

10-
local React = require(Packages.React)
11-
local render = require(script.Parent.Parent).render
8+
local React = require("@pkg/@jsdotlua/react")
9+
local render = require("..").render
1210

1311
-- This just verifies that by importing RTL in an
1412
-- environment which supports afterEach (like jest)

‎src/__tests__/cleanup.spec.lua‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11
-- ROBLOX upstream: https://github.com/testing-library/react-testing-library/blob/v12.1.5/src/__tests__/cleanup.js
2-
local Packages = script.Parent.Parent.Parent
3-
4-
local JestGlobals = require(Packages.JestGlobals)
2+
local JestGlobals = require("@pkg/@jsdotlua/jest-globals")
53
local expect = JestGlobals.expect
64
local test = JestGlobals.test
75
local describe = JestGlobals.describe
86
local beforeEach = JestGlobals.beforeEach
97
local afterEach = JestGlobals.afterEach
108
local jest = JestGlobals.jest
119

12-
local LuauPolyfill = require(Packages.LuauPolyfill)
10+
local LuauPolyfill = require("@pkg/@jsdotlua/luau-polyfill")
1311
local console = LuauPolyfill.console
1412

15-
local document = require(Packages.DomTestingLibrary).document
13+
local document = require("@pkg/@jsdotlua/dom-testing-library").document
1614

17-
local getElementByName = require(script.Parent.Parent.jsHelpers.Element).getElementByName
15+
local getElementByName = require("../jsHelpers/Element").getElementByName
1816

19-
local React = require(Packages.React)
17+
local React = require("@pkg/@jsdotlua/react")
2018

21-
local ParentModule = require(script.Parent.Parent)
19+
local ParentModule = require("..")
2220
local render = ParentModule.render
2321
local cleanup = ParentModule.cleanup
2422

‎src/__tests__/debug.spec.lua‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
-- ROBLOX upstream: https://github.com/testing-library/react-testing-library/blob/v12.1.5/src/__tests__/debug.js
2-
local Packages = script.Parent.Parent.Parent
3-
4-
local JestGlobals = require(Packages.JestGlobals)
2+
local JestGlobals = require("@pkg/@jsdotlua/jest-globals")
53
local expect = JestGlobals.expect
64
local test = JestGlobals.test
75
local beforeEach = JestGlobals.beforeEach
86
local afterEach = JestGlobals.afterEach
97
local afterAll = JestGlobals.afterAll
108
local jest = JestGlobals.jest
119

12-
local LuauPolyfill = require(Packages.LuauPolyfill)
10+
local LuauPolyfill = require("@pkg/@jsdotlua/luau-polyfill")
1311
local console = LuauPolyfill.console
1412

15-
local React = require(Packages.React)
16-
local ParentModule = require(script.Parent.Parent)
13+
local ParentModule = require("..")
14+
local React = require("@pkg/@jsdotlua/react")
1715
local render = ParentModule.render
1816
local screen = ParentModule.screen
1917

‎src/__tests__/end-to-end.spec.lua‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,21 @@
11
-- ROBLOX upstream: https://github.com/testing-library/react-testing-library/blob/v12.1.5/src/__tests__/end-to-end.js
2-
local Packages = script.Parent.Parent.Parent
3-
4-
local JestGlobals = require(Packages.JestGlobals)
2+
local JestGlobals = require("@pkg/@jsdotlua/jest-globals")
53
local expect = JestGlobals.expect
64
local describe = JestGlobals.describe
75
local test = JestGlobals.test
86
local beforeEach = JestGlobals.beforeEach
97
local afterEach = JestGlobals.afterEach
108
local jest = JestGlobals.jest
119

12-
local LuauPolyfill = require(Packages.LuauPolyfill)
10+
local LuauPolyfill = require("@pkg/@jsdotlua/luau-polyfill")
1311
local Array = LuauPolyfill.Array
1412
local setTimeout = LuauPolyfill.setTimeout
1513

16-
local Promise = require(Packages.Promise)
17-
local RegExp = require(Packages.Dev.LuauRegExp)
14+
local Promise = require("@pkg/@jsdotlua/promise")
15+
local RegExp = require("@pkg/luau-regexp")
1816

19-
local React = require(Packages.React)
20-
local ParentModule = require(script.Parent.Parent)
17+
local ParentModule = require("..")
18+
local React = require("@pkg/@jsdotlua/react")
2119
local render = ParentModule.render
2220
local waitForElementToBeRemoved = ParentModule.waitForElementToBeRemoved
2321
local screen = ParentModule.screen

‎src/__tests__/events.spec.lua‎

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
-- ROBLOX upstream: https://github.com/testing-library/react-testing-library/blob/v12.1.5/src/__tests__/events.js
2-
local Packages = script.Parent.Parent.Parent
3-
4-
local JestGlobals = require(Packages.JestGlobals)
2+
local JestGlobals = require("@pkg/@jsdotlua/jest-globals")
53
local expect = JestGlobals.expect
64
local test = JestGlobals.test
75
local describe = JestGlobals.describe
86
local jest = JestGlobals.jest
97

10-
local LuauPolyfill = require(Packages.LuauPolyfill)
8+
local LuauPolyfill = require("@pkg/@jsdotlua/luau-polyfill")
119
local Array = LuauPolyfill.Array
1210

13-
local React = require(Packages.React)
11+
local React = require("@pkg/@jsdotlua/react")
1412

15-
local ParentModule = require(script.Parent.Parent)
13+
local ParentModule = require("..")
1614
local render = ParentModule.render
1715
local fireEvent = ParentModule.fireEvent
1816

@@ -58,7 +56,7 @@ local unhandledEventTypes = {
5856
}
5957
-- ROBLOX deviation END
6058

61-
Array.forEach(eventTypes, function(ref)
59+
for _, ref in eventTypes do
6260
local type_, events, elementType, init = ref.type, ref.events, ref.elementType, ref.init
6361
describe(("%s Events"):format(type_), function()
6462
Array.forEach(events, function(event: { fireEventName: string, instanceEventName: string })
@@ -72,12 +70,12 @@ Array.forEach(eventTypes, function(ref)
7270
end)
7371
end)
7472
end)
75-
end)
73+
end
7674

77-
Array.forEach(eventTypes, function(ref)
75+
for _, ref in eventTypes do
7876
local type_, events, elementType, init = ref.type, ref.events, ref.elementType, ref.init
7977
describe(("Native %s Events"):format(type_), function()
80-
Array.forEach(events, function(eventName)
78+
for _, eventName in events do
8179
local nativeEventName = eventName.fireEventName:lower() -- The doubleClick synthetic event maps to the dblclick native event
8280
if nativeEventName == "doubleclick" then
8381
nativeEventName = "dblclick"
@@ -102,9 +100,9 @@ Array.forEach(eventTypes, function(ref)
102100
fireEvent[eventName.fireEventName](ref.current, init)
103101
expect(spy).toHaveBeenCalledTimes(1)
104102
end)
105-
end)
103+
end
106104
end)
107-
end)
105+
end
108106

109107
test("onChange works", function()
110108
local handleChange = jest.fn()
@@ -161,20 +159,20 @@ end)
161159

162160
-- ROBLOX deviation START: No upstream equivalent
163161

164-
Array.forEach(unhandledEventTypes, function(ref)
162+
for _, ref in unhandledEventTypes do
165163
local type_, events, elementType, init = ref.type, ref.events, ref.elementType, ref.init
166-
describe(("Unhandled %s Events"):format(type_), function()
167-
Array.forEach(events, function(event: { fireEventName: string })
164+
describe(`Unhandled {type_} Events`, function()
165+
for _, event: { fireEventName: string } in events do
168166
local propName = ("on%s%s"):format(event.fireEventName:sub(1, 1):upper(), event.fireEventName:sub(2))
169-
test(("triggers %s"):format(propName), function()
167+
test(`triggers {propName}`, function()
170168
local ref = React.createRef()
171169
render(React.createElement(elementType, { ref = ref }))
172170
expect(function()
173171
fireEvent[event.fireEventName](ref.current, init)
174172
end).toThrowError(string.format("Event '%s' not supported", event.fireEventName))
175173
end)
176-
end)
174+
end
177175
end)
178-
end)
176+
end
179177
-- ROBLOX deviation END
180178
return {}

‎src/__tests__/multi-base.spec.lua‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,15 @@
11
-- ROBLOX upstream: https://github.com/testing-library/react-testing-library/blob/v12.1.5/src/__tests__/multi-base.js
2-
local Packages = script.Parent.Parent.Parent
3-
4-
local JestGlobals = require(Packages.JestGlobals)
2+
local JestGlobals = require("@pkg/@jsdotlua/jest-globals")
53
local expect = JestGlobals.expect
64
local test = JestGlobals.test
75
local beforeAll = JestGlobals.beforeAll
86

97
local afterAll = JestGlobals.afterAll
108

11-
local document = require(Packages.DomTestingLibrary).document
9+
local document = require("@pkg/@jsdotlua/dom-testing-library").document
1210

13-
local React = require(Packages.React)
14-
local render = require(script.Parent.Parent).render
11+
local React = require("@pkg/@jsdotlua/react")
12+
local render = require("..").render
1513

1614
-- these are created once per test suite and reused for each case
1715
local treeA, treeB

‎src/__tests__/new-act.spec.lua‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11
-- ROBLOX upstream: https://github.com/testing-library/react-testing-library/blob/v12.1.5/src/__tests__/new-act.js
2-
local Packages = script.Parent.Parent.Parent
3-
4-
local JestGlobals = require(Packages.JestGlobals)
2+
local JestGlobals = require("@pkg/@jsdotlua/jest-globals")
53
local expect = JestGlobals.expect
64
local test = JestGlobals.test
75
local beforeEach = JestGlobals.beforeEach
86
local afterEach = JestGlobals.afterEach
97
local jest = JestGlobals.jest
108

11-
local LuauPolyfill = require(Packages.LuauPolyfill)
9+
local LuauPolyfill = require("@pkg/@jsdotlua/luau-polyfill")
1210
local Error = LuauPolyfill.Error
1311
local console = LuauPolyfill.console
1412
type Promise<T> = LuauPolyfill.Promise<T>
1513

16-
local Promise = require(Packages.Promise)
14+
local Promise = require("@pkg/@jsdotlua/promise")
1715

1816
local asyncAct, consoleErrorMock
1917

2018
-- ROBLOX deviation: Mock is not supported
21-
-- local _testUtils = require(script.Parent.Parent.jsHelpers["react-dom"]["test-utils"])
19+
-- local _testUtils = require("../jsHelpers/react-dom/test-utils")
2220
-- jest.mock(testUtils, function()
2321
-- return {
2422
-- act = function(cb)
@@ -29,7 +27,7 @@ local asyncAct, consoleErrorMock
2927

3028
beforeEach(function()
3129
jest.resetModules()
32-
asyncAct = require(script.Parent.Parent["act-compat"]).asyncAct
30+
asyncAct = require("../act-compat").asyncAct
3331
-- ROBLOX deviation START: replace spyOn
3432
consoleErrorMock = jest.fn()
3533
console.error = consoleErrorMock

0 commit comments

Comments
 (0)