mirror of
https://github.com/discourse/discourse.git
synced 2025-05-28 12:41:54 +08:00
Rename merge
to deepMerge
so it's more clear what it's doing
This commit is contained in:
@ -8,7 +8,7 @@ import {
|
||||
} from "pretty-text/inline-oneboxer";
|
||||
import { extractDataAttribute } from "pretty-text/engines/discourse-markdown-it";
|
||||
import { registerEmoji } from "pretty-text/emoji";
|
||||
import { merge } from "discourse-common/lib/object";
|
||||
import { deepMerge } from "discourse-common/lib/object";
|
||||
|
||||
QUnit.module("lib:pretty-text");
|
||||
|
||||
@ -39,7 +39,7 @@ QUnit.assert.cooked = function(input, expected, message) {
|
||||
};
|
||||
|
||||
QUnit.assert.cookedOptions = function(input, opts, expected, message) {
|
||||
const merged = merge({}, rawOpts, opts);
|
||||
const merged = deepMerge({}, rawOpts, opts);
|
||||
const actual = new PrettyText(buildOptions(merged)).cook(input);
|
||||
this.pushResult({
|
||||
result: actual === expected,
|
||||
|
Reference in New Issue
Block a user