Skip to content

Commit 2acbd85

Browse files
authored
Merge pull request #373 from mcasimir/cleanup/consistent_double_quotes
E2e tests, eslint + merge forked brettwsanders:cleanup/consistent_double_quotes
2 parents 1811cf8 + ad5a0ce commit 2acbd85

File tree

101 files changed

+3012
-2420
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+3012
-2420
lines changed

.babelrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"presets": [
3+
"es2015"
4+
],
5+
"plugins": [
6+
"syntax-async-functions",
7+
"transform-regenerator"
8+
]
9+
}

.depcheckrc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
var config = require('./config');
2+
3+
module.exports = {
4+
ignoreDirs: ['dist'],
5+
ignore: config.globs.js.concat(config.globs.fonts)
6+
.filter(function(path) {
7+
return path.match(/^node_modules/);
8+
}).map(function(path) {
9+
return path.split('/')[1];
10+
})
11+
.concat(config.depcheck.ignore)
12+
}

.eslintignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
node_modules/*
2+
lib/*
3+
coverage/*
4+
dist/*
5+
demo/*.min.js

.eslintrc

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
{
2+
"extends": [
3+
"eslint:recommended",
4+
"google"
5+
],
6+
"plugins": [
7+
"babel"
8+
],
9+
"parser": "babel-eslint",
10+
"parserOptions": {
11+
"sourceType": "module",
12+
"ecmaFeatures": {}
13+
},
14+
"globals": {
15+
"angular": false,
16+
"FastClick": false,
17+
"overthrow": false
18+
},
19+
"env": {
20+
"browser": true,
21+
"node": true
22+
},
23+
"rules": {
24+
"new-cap": 0,
25+
"no-console": [1, { "allow": ["info", "warn", "error"] }],
26+
"quotes": [2, "single"],
27+
"no-unused-vars": 2,
28+
"eqeqeq": 2,
29+
"complexity": [2, 10],
30+
"max-len": [2, 160],
31+
"comma-dangle": [2, "never"],
32+
"no-mixed-spaces-and-tabs": 2,
33+
"quote-props": [2, "as-needed"],
34+
"padded-blocks": 0,
35+
"require-jsdoc": 0,
36+
"generator-star-spacing": 0,
37+
"babel/generator-star-spacing": 1,
38+
"valid-jsdoc": 1
39+
}
40+
}

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,3 +150,5 @@ xcuserdata/
150150
sftp-config.json
151151

152152
travis.sh
153+
nohup.out
154+
test/e2e/screenshots/*.png

.jscsrc

Lines changed: 0 additions & 32 deletions
This file was deleted.

.jshintrc

Lines changed: 0 additions & 15 deletions
This file was deleted.

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: node_js
22
node_js:
3-
- 4.4.3
3+
- 6.2.1
44
sudo: required
55
before_install:
66
- sudo apt-get update

ci.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,7 @@
33
set -x
44
set -e
55

6-
xvfb-run gulp test:ci
6+
xvfb-run npm test
7+
8+
# Remove chrome temp files
9+
rm -Rf .com.google*

config.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
'use strict';
22

3-
var path = require('path');
3+
let path = require('path');
44

5-
var config = {
5+
let config = {
66
globs: {
77
core: [
88
'node_modules/fastclick/lib/fastclick.js',
@@ -39,6 +39,7 @@ var config = {
3939
ignore: [
4040
'angular',
4141
'angular-mocks',
42+
'angular-route',
4243
'bootstrap',
4344
'mobile-angular-ui',
4445
'jasmine-core',
@@ -48,7 +49,9 @@ var config = {
4849
'karma-selenium-webdriver-launcher',
4950
'karma-coverage',
5051
'karma-chrome-launcher',
51-
'selenium-webdriver'
52+
'selenium-webdriver',
53+
'chromedriver',
54+
'pre-commit'
5255
]
5356
},
5457
lint: ['./src/**/*.js', './test/**/*.js', './*.js']

0 commit comments

Comments
 (0)