mirror of
https://github.com/Hopiu/angular.js.git
synced 2026-05-16 18:51:06 +00:00
parent
5d9f42050a
commit
e848099d1b
4 changed files with 42 additions and 4 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -15,3 +15,4 @@ angular.xcodeproj
|
||||||
.agignore
|
.agignore
|
||||||
libpeerconnection.log
|
libpeerconnection.log
|
||||||
npm-debug.log
|
npm-debug.log
|
||||||
|
/tmp/
|
||||||
|
|
|
||||||
26
Gruntfile.js
26
Gruntfile.js
|
|
@ -11,6 +11,7 @@ module.exports = function(grunt) {
|
||||||
grunt.loadNpmTasks('grunt-ddescribe-iit');
|
grunt.loadNpmTasks('grunt-ddescribe-iit');
|
||||||
grunt.loadNpmTasks('grunt-merge-conflict');
|
grunt.loadNpmTasks('grunt-merge-conflict');
|
||||||
grunt.loadNpmTasks('grunt-parallel');
|
grunt.loadNpmTasks('grunt-parallel');
|
||||||
|
grunt.loadNpmTasks('grunt-shell');
|
||||||
grunt.loadTasks('lib/grunt');
|
grunt.loadTasks('lib/grunt');
|
||||||
|
|
||||||
var NG_VERSION = util.getVersion();
|
var NG_VERSION = util.getVersion();
|
||||||
|
|
@ -28,7 +29,7 @@ module.exports = function(grunt) {
|
||||||
parallel: {
|
parallel: {
|
||||||
travis: {
|
travis: {
|
||||||
tasks: [
|
tasks: [
|
||||||
util.parallelTask(['test:unit', 'test:docgen', 'tests:docs'], {stream: true}),
|
util.parallelTask(['test:unit', 'test:docgen', 'test:promises-aplus', 'tests:docs'], {stream: true}),
|
||||||
util.parallelTask(['test:e2e'])
|
util.parallelTask(['test:e2e'])
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
@ -97,7 +98,10 @@ module.exports = function(grunt) {
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
clean: {build: ['build']},
|
clean: {
|
||||||
|
build: ['build'],
|
||||||
|
tmp: ['tmp']
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
build: {
|
build: {
|
||||||
|
|
@ -164,6 +168,10 @@ module.exports = function(grunt) {
|
||||||
cookies: {
|
cookies: {
|
||||||
dest: 'build/angular-cookies.js',
|
dest: 'build/angular-cookies.js',
|
||||||
src: util.wrap(['src/ngCookies/cookies.js'], 'module')
|
src: util.wrap(['src/ngCookies/cookies.js'], 'module')
|
||||||
|
},
|
||||||
|
"promises-aplus-adapter": {
|
||||||
|
dest:'tmp/promises-aplus-adapter++.js',
|
||||||
|
src:['src/ng/q.js','lib/promises-aplus/promises-aplus-test-adapter.js']
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
@ -220,6 +228,17 @@ module.exports = function(grunt) {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
shell:{
|
||||||
|
"promises-aplus-tests":{
|
||||||
|
options:{
|
||||||
|
//stdout:true,
|
||||||
|
stderr:true,
|
||||||
|
failOnError:true
|
||||||
|
},
|
||||||
|
command:'./node_modules/.bin/promises-aplus-tests tmp/promises-aplus-adapter++.js'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
write: {
|
write: {
|
||||||
versionTXT: {file: 'build/version.txt', val: NG_VERSION.full},
|
versionTXT: {file: 'build/version.txt', val: NG_VERSION.full},
|
||||||
|
|
@ -229,7 +248,7 @@ module.exports = function(grunt) {
|
||||||
|
|
||||||
|
|
||||||
//alias tasks
|
//alias tasks
|
||||||
grunt.registerTask('test', 'Run unit, docs and e2e tests with Karma', ['package','test:unit', 'tests:docs', 'test:e2e']);
|
grunt.registerTask('test', 'Run unit, docs and e2e tests with Karma', ['package','test:unit','test:promises-aplus', 'tests:docs', 'test:e2e']);
|
||||||
grunt.registerTask('test:jqlite', 'Run the unit tests with Karma' , ['tests:jqlite']);
|
grunt.registerTask('test:jqlite', 'Run the unit tests with Karma' , ['tests:jqlite']);
|
||||||
grunt.registerTask('test:jquery', 'Run the jQuery unit tests with Karma', ['tests:jquery']);
|
grunt.registerTask('test:jquery', 'Run the jQuery unit tests with Karma', ['tests:jquery']);
|
||||||
grunt.registerTask('test:modules', 'Run the Karma module tests with Karma', ['tests:modules']);
|
grunt.registerTask('test:modules', 'Run the Karma module tests with Karma', ['tests:modules']);
|
||||||
|
|
@ -237,6 +256,7 @@ module.exports = function(grunt) {
|
||||||
grunt.registerTask('test:unit', 'Run unit, jQuery and Karma module tests with Karma', ['tests:jqlite', 'tests:jquery', 'tests:modules']);
|
grunt.registerTask('test:unit', 'Run unit, jQuery and Karma module tests with Karma', ['tests:jqlite', 'tests:jquery', 'tests:modules']);
|
||||||
grunt.registerTask('test:e2e', 'Run the end to end tests with Karma and keep a test server running in the background', ['connect:testserver', 'tests:end2end']);
|
grunt.registerTask('test:e2e', 'Run the end to end tests with Karma and keep a test server running in the background', ['connect:testserver', 'tests:end2end']);
|
||||||
grunt.registerTask('test:docgen', ['jasmine-node']);
|
grunt.registerTask('test:docgen', ['jasmine-node']);
|
||||||
|
grunt.registerTask('test:promises-aplus',['build:promises-aplus-adapter','shell:promises-aplus-tests']);
|
||||||
|
|
||||||
grunt.registerTask('minify', ['bower','clean', 'build', 'minall']);
|
grunt.registerTask('minify', ['bower','clean', 'build', 'minall']);
|
||||||
grunt.registerTask('webserver', ['connect:devserver']);
|
grunt.registerTask('webserver', ['connect:devserver']);
|
||||||
|
|
|
||||||
15
lib/promises-aplus/promises-aplus-test-adapter.js
Normal file
15
lib/promises-aplus/promises-aplus-test-adapter.js
Normal file
|
|
@ -0,0 +1,15 @@
|
||||||
|
var isFunction = function isFunction(value){return typeof value == 'function';}
|
||||||
|
|
||||||
|
var $q = qFactory(process.nextTick, function noopExceptionHandler() {});
|
||||||
|
|
||||||
|
exports.fulfilled = $q.resolve;
|
||||||
|
exports.rejected = $q.reject;
|
||||||
|
exports.pending = function () {
|
||||||
|
var deferred = $q.defer();
|
||||||
|
|
||||||
|
return {
|
||||||
|
promise: deferred.promise,
|
||||||
|
fulfill: deferred.resolve,
|
||||||
|
reject: deferred.reject
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
@ -33,7 +33,9 @@
|
||||||
"grunt-contrib-jasmine-node": "~0.1.1",
|
"grunt-contrib-jasmine-node": "~0.1.1",
|
||||||
"grunt-parallel": "git://github.com/vojtajina/grunt-parallel.git#streaming-per-task",
|
"grunt-parallel": "git://github.com/vojtajina/grunt-parallel.git#streaming-per-task",
|
||||||
"grunt-ddescribe-iit": "~0.0.1",
|
"grunt-ddescribe-iit": "~0.0.1",
|
||||||
"grunt-merge-conflict": "~0.0.1"
|
"grunt-merge-conflict": "~0.0.1",
|
||||||
|
"promises-aplus-tests": "~1.3.2",
|
||||||
|
"grunt-shell": "~0.3.1"
|
||||||
},
|
},
|
||||||
"licenses": [
|
"licenses": [
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue