Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: d-editor helper should be synchronous (#7706) 

Also ensures trigger has happened before assertion and prevents leaking formatTextWithSelection into global context
This commit is contained in:
Joffrey JAFFEUX 2019-06-05 14:52:38 +02:00 committed by GitHub
parent a77d8bee68
commit df95457468
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/javascripts/components/d-editor-test.js.es6
View File

@ -1,5 +1,6 @@
import componentTest from "helpers/component-test"; import componentTest from "helpers/component-test";
import { withPluginApi } from "discourse/lib/plugin-api"; import { withPluginApi } from "discourse/lib/plugin-api";
import formatTextWithSelection from "helpers/d-editor-helper";
moduleForComponent("d-editor", { integration: true }); moduleForComponent("d-editor", { integration: true });
@ -797,12 +798,14 @@ composerTestCase("replace-text event for composer", async function(assert) {
.lookup("app-events:main") .lookup("app-events:main")
.trigger("composer:replace-text", "green", "yellow", { forceFocus: true }); .trigger("composer:replace-text", "green", "yellow", { forceFocus: true });
let expect = await formatTextWithSelection(AFTER, CASE.after); // eslint-disable-line no-undef Ember.run.next(() => {
let actual = await formatTextWithSelection( // eslint-disable-line no-undef let expect = formatTextWithSelection(AFTER, CASE.after);
let actual = formatTextWithSelection(
this.value, this.value,
getTextareaSelection(textarea) getTextareaSelection(textarea)
); );
assert.equal(actual, expect); assert.equal(actual, expect);
}); });
});
} }
})(); })();

8
test/javascripts/helpers/d-editor-helper.js → test/javascripts/helpers/d-editor-helper.js.es6
View File

@ -1,8 +1,4 @@
Ember.Test.registerAsyncHelper("formatTextWithSelection", function( export default function formatTextWithSelection(text, [start, len]) {
app,
text,
[start, len]
) {
return [ return [
'"', '"',
text.substr(0, start), text.substr(0, start),
@ -12,4 +8,4 @@ Ember.Test.registerAsyncHelper("formatTextWithSelection", function(
text.substr(start + len), text.substr(start + len),
'"' '"'
].join(""); ].join("");
}); }

1
test/javascripts/test_helper.js
View File

@ -32,7 +32,6 @@
//= require helpers/assertions //= require helpers/assertions
//= require helpers/textarea-selection //= require helpers/textarea-selection
//= require helpers/select-kit-helper //= require helpers/select-kit-helper
//= require helpers/d-editor-helper
//= require helpers/qunit-helpers //= require helpers/qunit-helpers
//= require_tree ./fixtures //= require_tree ./fixtures