Skip to content

Commit 31d47d5

Browse files
committed
Mininum setup for tests to pass
1 parent 8db07b9 commit 31d47d5

File tree

5 files changed

+87
-90
lines changed

5 files changed

+87
-90
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ aws_credentials.json
1414
.*.swp
1515
tmp
1616
tags
17+
.virtualenv/

.python-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.4-pyregex
1+
3.4.3

Gruntfile.coffee

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -224,14 +224,14 @@ module.exports = (grunt) ->
224224
development:
225225
endpoint: "http://localhost:5000/api"
226226

227-
"s3-sync":
228-
options:
229-
key: "<%= aws.key %>"
230-
secret: "<%= aws.secret %>"
231-
bucket: "<%= aws.bucket %>"
232-
access: "public-read"
233-
concurrency: 20
234-
gzip: false
227+
# "s3-sync":
228+
# options:
229+
# key: "<%= aws.key %>"
230+
# secret: "<%= aws.secret %>"
231+
# bucket: "<%= aws.bucket %>"
232+
# access: "public-read"
233+
# concurrency: 20
234+
# gzip: false
235235

236236
dist:
237237
files: [
@@ -276,8 +276,7 @@ module.exports = (grunt) ->
276276
c = (k, args...) -> common.clone().insertAfter(k, args...)
277277
grunt.registerTask "build", c("copy", "gen_api:development")
278278
grunt.registerTask "build:production", c("copy", "gen_api:production")
279-
grunt.registerTask "deploy", ["clean", "build:production", "s3-sync"]
279+
grunt.registerTask "deploy", ["clean", "build:production"] # , "s3-sync"]
280280
grunt.registerTask "test", ["karma"]
281281
grunt.registerTask "default", ["clean", "build", "watch"]
282282
grunt.registerTask "server", ["build", "connect"]
283-

package.json

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,42 @@
22
"name": "pyregex-assets",
33
"version": "0.0.0",
44
"author": "Rodolfo Carvalho",
5-
"dependencies": {
6-
"grunt": "~0.4.0",
5+
6+
"engines": {
7+
"npm": "^2.15.0",
8+
"node": "^0.12.0"
9+
},
10+
11+
"scripts": {
12+
"test": "grunt build test",
13+
"build-dev": "grunt build",
14+
"build": "grunt build:production",
15+
"postinstall": "bower install"
16+
},
17+
18+
"devDependencies": {
19+
"grunt": "^0.4.0",
720
"grunt-contrib-coffee": "~0.7.0",
821
"grunt-contrib-copy": "~0.4.1",
922
"grunt-contrib-watch": "~0.5.1",
1023
"grunt-contrib-concat": "~0.3.0",
1124
"grunt-coffeelint": "0.0.7",
1225
"grunt-contrib-clean": "~0.5.0",
1326
"grunt-contrib-less": "~0.7.0",
14-
"grunt-s3-sync": "~0.2.1"
15-
},
16-
"devDependencies": {
27+
"grunt-cli": "^1.2.0",
28+
"grunt-contrib-connect": "~0.3.0",
29+
"grunt-markdown": "~0.4.0",
1730
"grunt-notify": "~0.2.4",
18-
"karma-script-launcher": "~0.1.0",
1931
"karma-chrome-launcher": "~0.1.0",
2032
"karma-firefox-launcher": "~0.1.0",
33+
"karma-growl-reporter": "~0.1.0",
2134
"karma-html2js-preprocessor": "~0.1.0",
2235
"karma-jasmine": "~0.1.0",
2336
"karma-requirejs": "~0.2.0",
2437
"karma-coffee-preprocessor": "~0.1.0",
2538
"karma-phantomjs-launcher": "~0.1.0",
2639
"karma": "~0.10.1",
2740
"grunt-karma": "~0.6.1",
28-
"karma-growl-reporter": "~0.1.0",
29-
"grunt-contrib-connect": "~0.3.0",
30-
"grunt-markdown": "~0.4.0"
41+
"karma-script-launcher": "~0.1.0"
3142
}
3243
}

tests/client/karma.conf.js

Lines changed: 56 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -2,74 +2,60 @@
22
// Generated on Thu Aug 08 2013 14:03:22 GMT-0300 (BRT)
33

44
module.exports = function(config) {
5-
config.set({
6-
7-
// base path, that will be used to resolve files and exclude
8-
basePath: '',
9-
10-
11-
// frameworks to use
12-
frameworks: ['jasmine'],
13-
14-
15-
// list of files / patterns to load in the browser
16-
files: [
17-
'../../public/assets/*.js',
18-
'../../public/assets/**/*.js',
19-
'../../assets/bower_components/angular-mocks/angular-mocks.js',
20-
'./**/*_spec.coffee',
21-
],
22-
23-
24-
// list of files to exclude
25-
exclude: [
26-
27-
],
28-
29-
30-
// test results reporter to use
31-
// possible values: 'dots', 'progress', 'junit', 'growl', 'coverage'
32-
reporters: ['dots', 'growl'],
33-
34-
35-
// web server port
36-
port: 9876,
37-
38-
39-
// enable / disable colors in the output (reporters and logs)
40-
colors: true,
41-
42-
43-
// level of logging
44-
// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
45-
logLevel: config.LOG_INFO,
46-
47-
48-
// enable / disable watching file and executing tests whenever any file changes
49-
autoWatch: true,
50-
51-
52-
// Start these browsers, currently available:
53-
// - Chrome
54-
// - ChromeCanary
55-
// - Firefox
56-
// - Opera
57-
// - Safari (only Mac)
58-
// - PhantomJS
59-
// - IE (only Windows)
60-
browsers: ['PhantomJS'],
61-
62-
63-
// If browser does not capture in given timeout [ms], kill it
64-
captureTimeout: 60000,
65-
66-
67-
// Continuous Integration mode
68-
// if true, it capture browsers, run tests and exit
69-
singleRun: true,
70-
71-
preprocessors: {
72-
'./**/*_spec.coffee': ['coffee']
73-
}
74-
});
5+
config.set({
6+
// base path, that will be used to resolve files and exclude
7+
basePath: '',
8+
9+
// frameworks to use
10+
frameworks: ['jasmine'],
11+
12+
// list of files / patterns to load in the browser
13+
files: [
14+
'../../public/assets/*.js',
15+
'../../public/assets/**/*.js',
16+
'../../assets/bower_components/angular-mocks/angular-mocks.js',
17+
'./**/*_spec.coffee',
18+
],
19+
20+
// list of files to exclude
21+
exclude: [],
22+
23+
// test results reporter to use
24+
// possible values: 'dots', 'progress', 'junit', 'growl', 'coverage'
25+
reporters: ['dots', 'growl'],
26+
27+
// web server port
28+
port: 9876,
29+
30+
// enable / disable colors in the output (reporters and logs)
31+
colors: true,
32+
33+
// level of logging
34+
// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
35+
logLevel: config.LOG_INFO,
36+
37+
// enable / disable watching file and executing tests whenever any file changes
38+
autoWatch: true,
39+
40+
// Start these browsers, currently available:
41+
// - Chrome
42+
// - ChromeCanary
43+
// - Firefox
44+
// - Opera
45+
// - Safari (only Mac)
46+
// - PhantomJS
47+
// - IE (only Windows)
48+
browsers: [process.env.CI === 'true' ? 'PhantomJS' : 'Chrome'],
49+
50+
// If browser does not capture in given timeout [ms], kill it
51+
captureTimeout: 60000,
52+
53+
// Continuous Integration mode
54+
// if true, it capture browsers, run tests and exit
55+
singleRun: true,
56+
57+
preprocessors: {
58+
'./**/*_spec.coffee': ['coffee'],
59+
},
60+
});
7561
};

0 commit comments

Comments
 (0)