mirror of
https://github.com/flarum/core.git
synced 2025-07-31 13:40:20 +02:00
More flexible API URL (necessary for testing)
This commit is contained in:
@@ -1,8 +1,9 @@
|
||||
import JsonApiAdapter from 'ember-json-api/json-api-adapter';
|
||||
import config from '../config/environment';
|
||||
|
||||
export default JsonApiAdapter.extend({
|
||||
|
||||
// Todo: make this loaded via an environment variable or something
|
||||
host: '/api'
|
||||
host: config.apiURL
|
||||
|
||||
});
|
@@ -5,6 +5,7 @@ module.exports = function(environment) {
|
||||
modulePrefix: 'flarum',
|
||||
environment: environment,
|
||||
baseURL: '/',
|
||||
apiURL: '/api',
|
||||
locationType: 'hash',
|
||||
EmberENV: {
|
||||
FEATURES: {
|
||||
@@ -31,6 +32,7 @@ module.exports = function(environment) {
|
||||
// Testem prefers this...
|
||||
ENV.baseURL = '/';
|
||||
ENV.locationType = 'none';
|
||||
ENV.apiURL = 'http://flarum.dev/api',
|
||||
|
||||
// keep test console output quieter
|
||||
ENV.APP.LOG_ACTIVE_GENERATION = false;
|
||||
|
Reference in New Issue
Block a user