Skip to content
Permalink
Browse files

Revert "FIX: Resolver wasn't being set properly"

This reverts commit 661aebd.
  • Loading branch information
eviltrout committed Mar 26, 2020
1 parent 60df2ad commit 6f2e3d61eec5a023ab898f4bb7b11021a3e821b1
Showing with 6 additions and 1 deletion.
  1. +6 −1 test/javascripts/test_helper.js
@@ -1,3 +1,5 @@
// discourse-skip-module

/*global document, sinon, QUnit, Logster */
//= require env
//= require jquery.debug
@@ -42,6 +44,9 @@
//
//= require jquery.magnific-popup.min.js

const buildResolver = require("discourse-common/resolver").buildResolver;
window.setResolver(buildResolver("discourse").create({ namespace: Discourse }));

sinon.config = {
injectIntoThis: false,
injectInto: null,
@@ -103,7 +108,7 @@ function resetSite(siteSettings, extras) {
QUnit.testStart(function(ctx) {
server = createPretender.default;
createPretender.applyDefaultHandlers(server);
server.handlers = []
server.handlers = [];

server.prepareBody = function(body) {
if (body && typeof body === "object") {

2 comments on commit 6f2e3d6

@discoursereviewbot

This comment has been minimized.

Copy link

@discoursereviewbot discoursereviewbot replied Mar 26, 2020

posted:

This says "Revert" but looks like a re-land?

@discoursereviewbot

This comment has been minimized.

Copy link

@discoursereviewbot discoursereviewbot replied Mar 27, 2020

Robin Ward posted:

The description got mangled unfortunately, because it was a revert of a revert.

Please sign in to comment.
You can’t perform that action at this time.