Skip to content
This repository has been archived by the owner on Feb 21, 2024. It is now read-only.

New repo configuration #1

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
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
14 changes: 6 additions & 8 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
# EditorConfig helps developers define and maintain consistent
# coding styles between different editors and IDEs
# editorconfig.org

root = true


[*]
end_of_line = lf
charset = utf-8
Expand All @@ -13,8 +6,13 @@ insert_final_newline = true
indent_style = space
indent_size = 2

[*.{html,css,hbs,js}]
indent_style = tab
indent_size = tab
tab_width = 4

[*.hbs]
insert_final_newline = false

[*.{diff,md}]
[*.md]
trim_trailing_whitespace = false
9 changes: 9 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
/* eslint-env node */
'use strict';

module.exports = {
extends: 'eslint-config-bbva',
env: {
browser: true
}
};
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.

# compiled output
/dist
/tmp
Expand Down
32 changes: 0 additions & 32 deletions .jshintrc

This file was deleted.

2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,6 @@ install:
script:
# Usually, it's ok to finish the test scenario without reverting
# to the addon's original dependency state, skipping "cleanup".
- node_modules/.bin/check-dependencies
- node_modules/.bin/eslint '**/*.js'
- ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
7 changes: 0 additions & 7 deletions circle.yml

This file was deleted.

3 changes: 3 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"license": "MIT",
"devDependencies": {
"broccoli-asset-rev": "^2.4.5",
"check-dependencies": "^1.1.0",
"ember-ajax": "^2.4.1",
"ember-cli": "2.9.1",
"ember-cli-app-version": "^2.0.0",
Expand All @@ -38,6 +39,8 @@
"ember-load-initializers": "^0.5.1",
"ember-resolver": "^2.0.3",
"ember-welcome-page": "^1.0.3",
"eslint": "^3.0.0",
"eslint-config-bbva": "^2.0.0",
"loader.js": "^4.0.10"
},
"keywords": [
Expand Down
32 changes: 21 additions & 11 deletions testem.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
/*jshint node:true*/
/* eslint-env node */
'use strict';

module.exports = {
"framework": "qunit",
"test_page": "tests/index.html?hidepassed",
"disable_watching": true,
"launch_in_ci": [
"PhantomJS"
],
"launch_in_dev": [
"PhantomJS",
"Chrome"
]
framework: 'qunit',
test_page: 'tests/index.html?hidepassed',
disable_watching: true,
browser_start_timeout: 180,
launch_in_ci: [
'Chrome'
],
launch_in_dev: [
'Chrome'
],
browser_args: {
Chrome: [
'--headless',
'--disable-gpu',
'--remote-debugging-port=9222',
'--window-size=1440,900'
]
}
};
8 changes: 8 additions & 0 deletions tests/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
/* eslint-env node */
'use strict';

module.exports = {
env: {
embertest: true
}
};
52 changes: 0 additions & 52 deletions tests/.jshintrc

This file was deleted.