84c2c2f477
Previously, `resetSite()` would immediately generate a new `Site` instance, and run all the initialization logic within the model. This included initializing Category objects. This was problematic because `resetSite()` is called before any initializers have been run. That means that any modifications to the Site or Category classes would not have any effect on the already-initialized Site/Category instances. This commit makes two main changes so so that the test environment is more production-like: 1. Update `resetSite` so that it simply stores the new data in the PreloadStore, and destroys the old Site instance. Initialization of a new site instance happens 'just in time' (normally during the `inject-discourse-objects` initializer) 2. Update the `helperContext` in tests to use getters. This avoids the need to look up `Site.current()` before initializers have run It also makes a minor adjustment to one test which was relying on a side-effect of the previous behavior. This should resolve the failing tests for discourse-category-expert under Ember-CLI: https://github.com/discourse/discourse-category-experts/pull/69
65 lines
2.1 KiB
JavaScript
65 lines
2.1 KiB
JavaScript
import KeyValueStore from "discourse/lib/key-value-store";
|
|
import RestAdapter from "discourse/adapters/rest";
|
|
import Store from "discourse/services/store";
|
|
import TopicListAdapter from "discourse/adapters/topic-list";
|
|
import TopicTrackingState from "discourse/models/topic-tracking-state";
|
|
import { buildResolver } from "discourse-common/resolver";
|
|
import { currentSettings } from "discourse/tests/helpers/site-settings";
|
|
import Site from "discourse/models/site";
|
|
|
|
const CatAdapter = RestAdapter.extend({
|
|
primaryKey: "cat_id",
|
|
});
|
|
|
|
export default function (customLookup = () => {}) {
|
|
const resolver = buildResolver("discourse").create();
|
|
|
|
// Normally this would happen in inject-discourse-objects.
|
|
// However, `create-store` is used by unit tests which do not init the application.
|
|
Site.current();
|
|
|
|
return Store.create({
|
|
register: {
|
|
lookup(type) {
|
|
if (type === "adapter:cat") {
|
|
this._catAdapter =
|
|
this._catAdapter || CatAdapter.create({ owner: this });
|
|
return this._catAdapter;
|
|
}
|
|
if (type === "adapter:rest") {
|
|
if (!this._restAdapter) {
|
|
this._restAdapter = RestAdapter.create({ owner: this });
|
|
}
|
|
return this._restAdapter;
|
|
}
|
|
if (type === "adapter:topicList") {
|
|
this._topicListAdapter =
|
|
this._topicListAdapter || TopicListAdapter.create({ owner: this });
|
|
return this._topicListAdapter;
|
|
}
|
|
if (type === "key-value-store:main") {
|
|
this._kvs = this._kvs || new KeyValueStore();
|
|
return this._kvs;
|
|
}
|
|
if (type === "topic-tracking-state:main") {
|
|
this._tracker = this._tracker || TopicTrackingState.create();
|
|
return this._tracker;
|
|
}
|
|
if (type === "site-settings:main") {
|
|
this._settings = this._settings || currentSettings();
|
|
return this._settings;
|
|
}
|
|
return customLookup(type);
|
|
},
|
|
|
|
lookupFactory(type) {
|
|
const split = type.split(":");
|
|
return resolver.customResolve({
|
|
type: split[0],
|
|
fullNameWithoutType: split[1],
|
|
});
|
|
},
|
|
},
|
|
});
|
|
}
|