From 9afa55a3fd5f0421d6b0784c75edbf1751e83974 Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 22 Nov 2016 15:36:18 -0500 Subject: [PATCH] FIX: Random failing plugin tests --- app/assets/javascripts/discourse/lib/plugin-api.js.es6 | 4 ++++ .../test/javascripts/acceptance/details-button-test.js.es6 | 4 ---- test/javascripts/helpers/qunit-helpers.js.es6 | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 b/app/assets/javascripts/discourse/lib/plugin-api.js.es6 index 29085492932..c4833d4b45e 100644 --- a/app/assets/javascripts/discourse/lib/plugin-api.js.es6 +++ b/app/assets/javascripts/discourse/lib/plugin-api.js.es6 @@ -368,6 +368,10 @@ function decorate(klass, evt, cb) { klass.reopen(mixin); } +export function resetPluginApi() { + _pluginv01 = null; +} + export function decorateCooked() { console.warn('`decorateCooked` has been removed. Use `getPluginApi(version).decorateCooked` instead'); } diff --git a/plugins/discourse-details/test/javascripts/acceptance/details-button-test.js.es6 b/plugins/discourse-details/test/javascripts/acceptance/details-button-test.js.es6 index 5109b62881b..afe45dfffd6 100644 --- a/plugins/discourse-details/test/javascripts/acceptance/details-button-test.js.es6 +++ b/plugins/discourse-details/test/javascripts/acceptance/details-button-test.js.es6 @@ -9,10 +9,6 @@ function findTextarea() { test('details button', () => { visit("/"); - andThen(() => { - ok(exists('#create-topic'), 'the create button is visible'); - }); - click('#create-topic'); click('button.options'); click('.popup-menu .fa-caret-right'); diff --git a/test/javascripts/helpers/qunit-helpers.js.es6 b/test/javascripts/helpers/qunit-helpers.js.es6 index 1fe326b36bd..3e235474a39 100644 --- a/test/javascripts/helpers/qunit-helpers.js.es6 +++ b/test/javascripts/helpers/qunit-helpers.js.es6 @@ -4,6 +4,7 @@ import sessionFixtures from 'fixtures/session-fixtures'; import siteFixtures from 'fixtures/site-fixtures'; import HeaderComponent from 'discourse/components/site-header'; import { forceMobile, resetMobile } from 'discourse/lib/mobile'; +import { resetPluginApi } from 'discourse/lib/plugin-api'; function currentUser() { return Discourse.User.create(sessionFixtures['/session/current.json'].current_user); @@ -74,6 +75,7 @@ function acceptance(name, options) { Discourse.User.resetCurrent(); Discourse.Site.resetCurrent(Discourse.Site.create(jQuery.extend(true, {}, fixtures['site.json'].site))); + resetPluginApi(); Discourse.reset(); } });