github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-28 12:41:54 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Rename merge to deepMerge so it's more clear what it's doing

Browse Source
This commit is contained in:
Robin Ward
2020-09-02 12:04:14 -04:00
parent f365d4639a
commit 3a46e44ed8
15 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/javascripts/lib/pretty-text-test.js
View File

@ -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,