Skip to content

Commit 0d73b5c

Browse files
authored
Merge pull request #44 from Exelord/feature-upgrades-3.1
Upgrade to ember 3.1
2 parents f4db09a + 622532b commit 0d73b5c

File tree

7 files changed

+1051
-577
lines changed

7 files changed

+1051
-577
lines changed

.eslintignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/blueprints/*/files/**/*.js

.eslintrc.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,17 @@ module.exports = {
2020
// node files
2121
{
2222
files: [
23+
'ember-cli-build.js',
2324
'index.js',
2425
'testem.js',
25-
'ember-cli-build.js',
26+
'blueprints/*/index.js',
2627
'config/**/*.js',
2728
'tests/dummy/config/**/*.js'
2829
],
2930
excludedFiles: [
30-
'app/**',
3131
'addon/**',
32+
'addon-test-support/**',
33+
'app/**',
3234
'tests/dummy/app/**'
3335
],
3436
parserOptions: {

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ You can pass a query params for a request by passing an `{}` with properties, eg
308308

309309
* `ember test` – Runs the test suite on the current Ember version
310310
* `ember test --server` – Runs the test suite in "watch mode"
311-
* `npm test` – Runs `ember try:each` to test your addon against multiple Ember versions
311+
* `ember try:each` – Runs the test suite against multiple Ember versions
312312

313313
### Running the dummy application
314314

addon/mixins/adapter.js

+15
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,20 @@ export default Mixin.create({
4646
*/
4747
dataForCustomAction({ data }) {
4848
return data;
49+
},
50+
51+
/**
52+
@public
53+
@method customRequest
54+
@param {String} method Method of the request, eg: 'GET', 'POST' etc
55+
@param {String} path Path of the request, eg. 'my/custom/endpoint'
56+
@return {Promise} Response promise of the request
57+
*/
58+
customRequest(method, path, options = {}) {
59+
let queryParams = options.queryParams || {};
60+
let ajaxOptions = options.ajaxOptions || {};
61+
62+
let url = urlBuilder(this._buildURL(), path, queryParams);
63+
return this.ajax(url, method, ajaxOptions);
4964
}
5065
});

config/ember-try.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module.exports = function() {
66
return Promise.all([
77
getChannelURL('release'),
88
getChannelURL('beta'),
9-
getChannelURL('canary'),
9+
getChannelURL('canary')
1010
]).then((urls) => {
1111
return {
1212
scenarios: [

0 commit comments

Comments
 (0)