Skip to content

Commit b188176

Browse files
ctumolosusBerkeleyTrue
authored andcommitted
fix: incorrect formatting of message with arguments
1 parent e480622 commit b188176

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

test/package/development.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,15 @@ module.exports = function() {
2121
warning(true, 'warning message');
2222

2323
expect(mockFn).toHaveBeenCalledTimes(1);
24-
expect(calls[0][0])
25-
.toEqual(expect.stringMatching(/warning: warning message/i));
24+
expect(mockFn).toHaveBeenCalledWith('Warning: warning message');
25+
26+
// should format message with arguments
27+
warning(false, 'warning %s with one argument', 'message');
28+
warning(false, 'warning %s with %s arguments', 'message', 'two');
29+
30+
expect(mockFn).toHaveBeenCalledTimes(3);
31+
expect(mockFn).toHaveBeenCalledWith('Warning: warning message with one argument');
32+
expect(mockFn).toHaveBeenCalledWith('Warning: warning message with two arguments');
2633

2734
console.error = error;
2835
};

warning.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ var warning = function() {};
2121
if (__DEV__) {
2222
var printWarning = function printWarning(format, args) {
2323
var len = arguments.length;
24-
args = new Array(len > 2 ? len - 2 : 0);
25-
for (var key = 2; key < len; key++) {
26-
args[key - 2] = arguments[key];
24+
args = new Array(len > 1 ? len - 1 : 0);
25+
for (var key = 1; key < len; key++) {
26+
args[key - 1] = arguments[key];
2727
}
2828
var argIndex = 0;
2929
var message = 'Warning: ' +

0 commit comments

Comments
 (0)