diff --git a/app/app/mirage/config.js b/app/app/mirage/config.js
index d006425e..eee36605 100644
--- a/app/app/mirage/config.js
+++ b/app/app/mirage/config.js
@@ -8,7 +8,7 @@ export default function() {
Note: these only affect routes defined *after* them!
*/
// this.urlPrefix = ''; // make this `http://localhost:8080`, for example, if your API is on a different server
- // this.namespace = ''; // make this `api`, for example, if your API is namespaced
+ this.namespace = 'api/public'; // make this `api`, for example, if your API is namespaced
// this.timing = 400; // delay for each request, automatically set to 0 during testing
/*
@@ -17,6 +17,8 @@ export default function() {
/*
GET shorthands
+ this.get()
+
// Collections
this.get('/contacts');
this.get('/contacts', 'users');
@@ -28,6 +30,12 @@ export default function() {
this.get('/contacts/:id', ['contact', 'addresses']);
*/
+ this.get('/authenticate', function() {
+ return {
+
+ };
+ });
+
/*
POST shorthands
diff --git a/app/app/router.js b/app/app/router.js
index dd9b740a..11979a7f 100644
--- a/app/app/router.js
+++ b/app/app/router.js
@@ -94,9 +94,9 @@ export default Router.map(function() {
path: 'widgets'
});
- this.route('not-found', {
- path: '/*wildcard'
- });
+ // this.route('not-found', {
+ // path: '/*wildcard'
+ // });
this.route('pods', function() {});
-});
\ No newline at end of file
+});
diff --git a/app/config/environment.js b/app/config/environment.js
index 77f0ac3b..5ddcd95a 100644
--- a/app/config/environment.js
+++ b/app/config/environment.js
@@ -24,6 +24,9 @@ module.exports = function(environment) {
EmberENV: {
FEATURES: {}
+ },
+ "ember-cli-mirage": {
+ enabled: false
},
APP: {}
};
@@ -42,12 +45,13 @@ module.exports = function(environment) {
ENV.APP.LOG_VIEW_LOOKUPS = false;
// ENV.APP.LOG_TRANSITIONS = false;
// ENV.APP.LOG_TRANSITIONS_INTERNAL = false;
- ENV.APP.LOG_TRANSITIONS = true;
- ENV.APP.LOG_TRANSITIONS_INTERNAL = true;
- // ENV.baseURL = '/';
- // ENV.locationType = 'none';
- // ENV.APP.rootElement = '#ember-testing';
+ ENV.baseURL = '/';
+ ENV.locationType = 'none';
+ ENV.APP.rootElement = '#ember-testing';
+ ENV['ember-cli-mirage'] = {
+ enabled: true
+ };
ENV.apiHost = "https://localhost:5001";
// ENV.apiHost = "https://demo1.dev:5001";
diff --git a/app/tests/index.html b/app/tests/index.html
index d8285128..8c89846b 100644
--- a/app/tests/index.html
+++ b/app/tests/index.html
@@ -6,15 +6,22 @@
Documize Tests
- {{content-for "head"}} {{content-for "test-head"}}
+
+
+ {{content-for "head"}}
+ {{content-for "test-head"}}
- {{content-for "head-footer"}} {{content-for "test-head-footer"}}
+
+
+ {{content-for "head-footer"}}
+ {{content-for "test-head-footer"}}
- {{content-for "body"}} {{content-for "test-body"}}
+ {{content-for "body"}}
+ {{content-for "test-body"}}
@@ -23,7 +30,8 @@
- {{content-for "body-footer"}} {{content-for "test-body-footer"}}
+ {{content-for "body-footer"}}
+ {{content-for "test-body-footer"}}
-