Skip to content
This repository was archived by the owner on Jan 30, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
module.exports = {
extends: 'plugin:ember-suave/recommended',
extends: [
'eslint:recommended',
'plugin:ember-suave/recommended'
],
root: true,
parserOptions: {
ecmaVersion: 6,
Expand All @@ -9,6 +12,10 @@ module.exports = {
'browser': true
},
rules: {
'ember-suave/no-const-outside-module-scope': 'off'
// Ember Suave
'ember-suave/no-const-outside-module-scope': 'off',

// Built-In Rules
'prefer-const': 'error'
}
};
2 changes: 1 addition & 1 deletion addon/errors.js
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,6 @@ export function isServerError(error) {
* @return {Boolean}
*/
export function isSuccess(status) {
let s = parseInt(status, 10);
const s = parseInt(status, 10);
return s >= 200 && s < 300 || s === 304;
}
15 changes: 7 additions & 8 deletions addon/mixins/ajax-request.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import { isFullURL, parseURL, haveSameHost } from 'ember-ajax/-private/utils/url
import ajax from 'ember-ajax/utils/ajax';

const {
$,
A,
Error: EmberError,
Logger,
Expand Down Expand Up @@ -60,7 +59,7 @@ function defineDeprecatedErrorsProperty(error, errors) {
}
);

let defaultError = {
const defaultError = {
title: 'Ajax Error',
detail: this.message
};
Expand Down Expand Up @@ -273,7 +272,7 @@ export default Mixin.create({

return new Promise((resolve, reject) => {
hash.success = (payload, textStatus, jqXHR) => {
let response = this.handleResponse(
const response = this.handleResponse(
jqXHR.status,
parseResponseHeaders(jqXHR.getAllResponseHeaders()),
payload,
Expand All @@ -291,8 +290,8 @@ export default Mixin.create({

hash.error = (jqXHR, textStatus, errorThrown) => {
runInDebug(function() {
let message = `The server returned an empty string for ${requestData.type} ${requestData.url}, which cannot be parsed into a valid JSON. Return either null or {}.`;
let validJSONString = !(textStatus === 'parsererror' && jqXHR.responseText === '');
const message = `The server returned an empty string for ${requestData.type} ${requestData.url}, which cannot be parsed into a valid JSON. Return either null or {}.`;
const validJSONString = !(textStatus === 'parsererror' && jqXHR.responseText === '');
warn(message, validJSONString, {
id: 'ds.adapter.returned-empty-string-as-JSON'
});
Expand Down Expand Up @@ -559,7 +558,7 @@ export default Mixin.create({
} else if (this.isServerError(status, headers, payload)) {
error = new ServerError(payload);
} else {
let detailedMessage = this.generateDetailedMessage(
const detailedMessage = this.generateDetailedMessage(
status,
headers,
payload,
Expand All @@ -569,7 +568,7 @@ export default Mixin.create({
error = new AjaxError(payload, detailedMessage);
}

let errors = this.normalizeErrorResponse(status, headers, payload);
const errors = this.normalizeErrorResponse(status, headers, payload);

defineDeprecatedErrorsProperty(error, errors);

Expand Down Expand Up @@ -853,7 +852,7 @@ export default Mixin.create({
if (isArray(payload.errors)) {
return payload.errors.map(function(error) {
if (isObject(error)) {
let ret = merge({}, error);
const ret = merge({}, error);
ret.status = `${error.status}`;
return ret;
} else {
Expand Down
4 changes: 2 additions & 2 deletions addon/mixins/ajax-support.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ export default Mixin.create({
*/
headers: alias('ajaxService.headers'),

ajax(url, type, options = {}) {
let augmentedOptions = this.ajaxOptions(...arguments);
ajax(url) {
const augmentedOptions = this.ajaxOptions(...arguments);

return this.get('ajaxService').request(url, augmentedOptions);
}
Expand Down
2 changes: 1 addition & 1 deletion tests/acceptance/ember-data-integration-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ describe('Acceptance | ember data integration', function() {

it('respects ajaxOptions on the target adapter', function() {
server.get('api/posts/1', function({ requestHeaders }) {
let xSillyHeader = requestHeaders['X-Silly-Option'];
const xSillyHeader = requestHeaders['X-Silly-Option'];
equal(xSillyHeader, 'Hi!');

return jsonResponse(200, {
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/adapters/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default JSONAPIAdapter.extend(AjaxServiceSupport, {
namespace: 'api',

ajaxOptions() {
let hash = this._super(...arguments);
const hash = this._super(...arguments);

hash.headers = {
'X-Silly-Option': 'Hi!'
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/app/components/ajax-get.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export default Component.extend({
ajax: inject.service(),
actions: {
load() {
let url = this.get('url');
const url = this.get('url');
return this.get('ajax').request(url)
.then((data) => {
this.setProperties({
Expand Down
6 changes: 3 additions & 3 deletions tests/integration/components/async-widget-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ describeComponent(
const authToken = 'foo';
this.register('service:session', Service.extend({ authToken }));

let receivedHeaders = [];
const receivedHeaders = [];
this.register('service:fajax', AjaxService.extend({
options() {
let options = this._super(...arguments);
const options = this._super(...arguments);
Object.keys(options.headers).forEach((key) => {
receivedHeaders.push([key, options.headers[key]]);
});
Expand All @@ -52,7 +52,7 @@ describeComponent(
headers: computed('session.authToken', {
get() {
const headers = {};
let authToken = this.get('session.authToken');
const authToken = this.get('session.authToken');
if (authToken) {
headers.authToken = authToken;
}
Expand Down
3 changes: 3 additions & 0 deletions tests/test-helper.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import Ember from 'ember';
import resolver from './helpers/resolver';
import { setResolver } from 'ember-mocha';

const { $ } = Ember;

setResolver(resolver);

if (window.location.search.indexOf('nocontainer') > -1) {
Expand Down
12 changes: 5 additions & 7 deletions tests/unit/mixins/ajax-request-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -243,8 +243,8 @@ describe('Unit | Mixin | ajax request', function() {

it('request() promise label is correct', function() {
const service = new AjaxRequest();
let url = '/posts';
let data = {
const url = '/posts';
const data = {
type: 'POST',
data: {
post: { title: 'Title', description: 'Some description.' }
Expand All @@ -267,7 +267,7 @@ describe('Unit | Mixin | ajax request', function() {
const url = '/posts';
const title = 'Title';
const description = 'Some description.';
let options = {
const options = {
data: {
post: { title, description }
}
Expand Down Expand Up @@ -759,7 +759,7 @@ describe('Unit | Mixin | ajax request', function() {
];

[NamespaceLeadingSlash, NamespaceTrailingSlash, NamespaceTwoSlash, NamespaceNoSlash].forEach((Klass) => {
let req = new Klass();
const req = new Klass();

hosts.forEach((exampleHost) => {
const { host } = exampleHost;
Expand Down Expand Up @@ -907,9 +907,7 @@ describe('Unit | Mixin | ajax request', function() {
expect(reason instanceof errorClass).to.be.ok;
expect(reason.payload).to.not.be.undefined;

let {
errors
} = reason.payload;
const { errors } = reason.payload;

expect(errors && typeOf(errors) === 'array').to.be.ok;
expect(errors[0].id).to.equal(1);
Expand Down