Skip to content

fix(rstest): bugs #10844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 14, 2025
Merged

fix(rstest): bugs #10844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crates/rspack_plugin_rstest/src/import_dependency.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ pub fn module_id_rstest(
}
}

const WEBPACK_REQUIRE_IMPORT_ACTUAL: &str = "__webpack_require__.import_actual";
const WEBPACK_REQUIRE_IMPORT_ACTUAL: &str = "__webpack_require__.rstest_import_actual";

// To support use `__webpack_require__.import_actual` for `importActual`.
fn module_namespace_promise_rstest(
Expand Down
11 changes: 6 additions & 5 deletions crates/rspack_plugin_rstest/src/mock_method_dependency.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ pub struct MockMethodDependency {
pub enum MockMethod {
Mock,
Unmock,
Hoisted,
}

impl MockMethodDependency {
Expand Down Expand Up @@ -71,7 +72,6 @@ impl DependencyTemplate for MockMethodDependencyTemplate {
code_generatable_context: &mut TemplateContext,
) {
let TemplateContext { init_fragments, .. } = code_generatable_context;

let dep = dep
.as_any()
.downcast_ref::<MockMethodDependency>()
Expand All @@ -81,18 +81,19 @@ impl DependencyTemplate for MockMethodDependencyTemplate {
let hoist_flag = match dep.method {
MockMethod::Mock => "MOCK",
MockMethod::Unmock => "UNMOCK",
MockMethod::Hoisted => "HOISTED",
};

let mock_method = match dep.method {
MockMethod::Mock => "set_mock",
MockMethod::Unmock => "unmock",
MockMethod::Mock => "rstest_set_mock",
MockMethod::Unmock => "rstest_unmock",
MockMethod::Hoisted => "rstest_hoisted",
};

if dep.hoist {
// Placeholder of hoist target.
let init = NormalInitFragment::new(
format!("/* RSTEST:{hoist_flag}_PLACEHOLDER:{request} */;"),
InitFragmentStage::StageConstants,
InitFragmentStage::StageESMImports,
0,
InitFragmentKey::Const(format!("retest mock_hoist {request}")),
None,
Expand Down
52 changes: 38 additions & 14 deletions crates/rspack_plugin_rstest/src/parser_plugin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ impl RstestParserPlugin {
.presentational_dependencies
.push(Box::new(ConstDependency::new(
range,
".require_actual".into(),
".rstest_require_actual".into(),
None,
)));

Expand Down Expand Up @@ -158,7 +158,7 @@ impl RstestParserPlugin {
.unwrap_or(value.as_ref())
.to_string(),
);
let is_relative_request = path_buf.starts_with("."); // TODO: consider alias?
let is_relative_request = path_buf.to_string().starts_with("."); // TODO: consider alias?
let mocked_target = if is_relative_request {
// Mock relative request to alongside `__mocks__` directory.
path_buf
Expand Down Expand Up @@ -287,14 +287,33 @@ impl RstestParserPlugin {
}
}

fn hoisted(&self, parser: &mut JavascriptParser, call_expr: &CallExpr) {
match call_expr.args.len() {
1 => {
parser
.presentational_dependencies
.push(Box::new(MockMethodDependency::new(
call_expr.span(),
call_expr.callee.span(),
call_expr.span().real_lo().to_string(),
true,
MockMethod::Hoisted,
)));
}
_ => {
panic!("`rs.hoisted` function expects 1 argument, got more than 1");
}
}
}

fn reset_modules(&self, parser: &mut JavascriptParser, call_expr: &CallExpr) -> Option<bool> {
match call_expr.args.len() {
0 => {
parser
.presentational_dependencies
.push(Box::new(ConstDependency::new(
call_expr.callee.span().into(),
"__webpack_require__.reset_modules".into(),
"__webpack_require__.rstest_reset_modules".into(),
None,
)));
Some(true)
Expand Down Expand Up @@ -417,56 +436,61 @@ impl JavascriptParserPlugin for RstestParserPlugin {
if let Some(prop) = q.prop.as_ident() {
match (ident.sym.as_str(), prop.sym.as_str()) {
// rs.mock
("rs", "mock") => {
("rs", "mock") | ("rstest", "mock") => {
self.process_mock(parser, call_expr, true, true, MockMethod::Mock, true);
return Some(false);
}
// rs.mockRequire
("rs", "mockRequire") => {
("rs", "mockRequire") | ("rstest", "mockRequire") => {
self.process_mock(parser, call_expr, true, false, MockMethod::Mock, true);
return Some(false);
}
// rs.doMock
("rs", "doMock") => {
("rs", "doMock") | ("rstest", "doMock") => {
self.process_mock(parser, call_expr, false, true, MockMethod::Mock, true);
return Some(false);
}
// rs.doMockRequire
("rs", "doMockRequire") => {
("rs", "doMockRequire") | ("rstest", "doMockRequire") => {
self.process_mock(parser, call_expr, false, false, MockMethod::Mock, true);
return Some(false);
}
// rs.importActual
("rs", "importActual") => {
("rs", "importActual") | ("rstest", "importActual") => {
return self.process_import_actual(parser, call_expr);
}
// rs.requireActual
("rs", "requireActual") => {
("rs", "requireActual") | ("rstest", "requireActual") => {
return self.process_require_actual(parser, call_expr);
}
// rs.importMock
("rs", "importMock") => {
("rs", "importMock") | ("rstest", "importMock") => {
return self.load_mock(parser, call_expr, true);
}
// rs.requireMock
("rs", "requireMock") => {
("rs", "requireMock") | ("rstest", "requireMock") => {
return self.load_mock(parser, call_expr, false);
}
// rs.unmock
("rs", "unmock") => {
("rs", "unmock") | ("rstest", "unmock") => {
self.process_mock(parser, call_expr, true, true, MockMethod::Unmock, false);
return Some(true);
}
// rs.doUnmock
("rs", "doUnmock") => {
("rs", "doUnmock") | ("rstest", "doUnmock") => {
// return self.unmock_method(parser, call_expr, true);
self.process_mock(parser, call_expr, false, true, MockMethod::Unmock, false);
return Some(true);
}
// rs.resetModules
("rs", "resetModules") => {
("rs", "resetModules") | ("rstest", "resetModules") => {
return self.reset_modules(parser, call_expr);
}
// rs.hoisted
("rs", "hoisted") | ("rstest", "hoisted") => {
self.hoisted(parser, call_expr);
return Some(true);
}
_ => {
// Not a mock module, continue.
return None;
Expand Down
4 changes: 2 additions & 2 deletions packages/rspack-test-tools/tests/configCases/rstest/mock/importActual.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { foo } from './src/barrel'

rs.mock('./src/foo')
rstest.mock('./src/foo')

it('importActual should works', async () => {
expect(foo).toBe('mocked_foo')
const originalFoo = await rs.importActual('./src/foo')
const originalFoo = await rstest.importActual('./src/foo')
expect(originalFoo.value).toBe('foo')
})
14 changes: 7 additions & 7 deletions packages/rspack-test-tools/tests/configCases/rstest/mock/rspack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,24 @@ if (typeof __webpack_require__ === 'undefined') {
return;
}

__webpack_require__.before_mocked_modules = {};
__webpack_require__.rstest_original_modules = {};

__webpack_require__.reset_modules = () => {
__webpack_require__.rstest_reset_modules = () => {
__webpack_module_cache__ = {};
}

__webpack_require__.unmock = (id) => {
__webpack_require__.rstest_unmock = (id) => {
delete __webpack_module_cache__[id]
}

__webpack_require__.import_actual = __webpack_require__.require_actual = (id) => {
const beforeMock = __webpack_require__.before_mocked_modules[id];
__webpack_require__.rstest_import_actual = __webpack_require__.rstest_require_actual = (id) => {
const beforeMock = __webpack_require__.rstest_original_modules[id];
return beforeMock;
}

__webpack_require__.set_mock = (id, modFactory) => {
__webpack_require__.rstest_set_mock = (id, modFactory) => {
if (typeof modFactory === 'string' || typeof modFactory === 'number') {
__webpack_require__.before_mocked_modules[id] = __webpack_require__(id);
__webpack_require__.rstest_original_modules[id] = __webpack_require__(id);
__webpack_module_cache__[id] = { exports: __webpack_require__(modFactory) };
} else if (typeof modFactory === 'function') {
__webpack_module_cache__[id] = { exports: modFactory() };
Expand Down
Loading