Skip to content

Commit b72ea59

Browse files
chore(docs-app): re-activate docs-app test tasks
Currently there is only a minimal test spec in place. But this will now be run as part of the test tasks.
1 parent 3b5480e commit b72ea59

File tree

5 files changed

+11
-57
lines changed

5 files changed

+11
-57
lines changed

Gruntfile.js

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ module.exports = function(grunt) {
2323
parallel: {
2424
travis: {
2525
tasks: [
26-
util.parallelTask(['test:unit', 'test:promises-aplus'/*, 'tests:docs'*/], {stream: true}),
26+
util.parallelTask(['test:unit', 'test:promises-aplus', 'tests:docs'], {stream: true}),
2727
util.parallelTask(['test:e2e'])
2828
]
2929
}
@@ -77,7 +77,7 @@ module.exports = function(grunt) {
7777
tests: {
7878
jqlite: 'karma-jqlite.conf.js',
7979
jquery: 'karma-jquery.conf.js',
80-
//docs: 'karma-docs.conf.js',
80+
docs: 'karma-docs.conf.js',
8181
modules: 'karma-modules.conf.js'
8282
},
8383

@@ -86,7 +86,7 @@ module.exports = function(grunt) {
8686
jqlite: 'karma-jqlite.conf.js',
8787
jquery: 'karma-jquery.conf.js',
8888
modules: 'karma-modules.conf.js',
89-
//docs: 'karma-docs.conf.js'
89+
docs: 'karma-docs.conf.js'
9090
},
9191

9292

@@ -217,14 +217,6 @@ module.exports = function(grunt) {
217217
},
218218

219219

220-
// docs: {
221-
// process: ['build/docs/*.html', 'build/docs/.htaccess']
222-
// },
223-
224-
"jasmine_node": {
225-
projectRoot: 'docs/spec'
226-
},
227-
228220
"ddescribe-iit": {
229221
files: [
230222
'test/**/*.js',
@@ -286,11 +278,11 @@ module.exports = function(grunt) {
286278

287279

288280
//alias tasks
289-
grunt.registerTask('test', 'Run unit, docs and e2e tests with Karma', ['jshint', 'package','test:unit','test:promises-aplus'/*, 'tests:docs'*/, 'test:protractor']);
281+
grunt.registerTask('test', 'Run unit, docs and e2e tests with Karma', ['jshint', 'package','test:unit','test:promises-aplus', 'tests:docs', 'test:protractor']);
290282
grunt.registerTask('test:jqlite', 'Run the unit tests with Karma' , ['tests:jqlite']);
291283
grunt.registerTask('test:jquery', 'Run the jQuery unit tests with Karma', ['tests:jquery']);
292284
grunt.registerTask('test:modules', 'Run the Karma module tests with Karma', ['tests:modules']);
293-
grunt.registerTask('test:docs', 'Run the doc-page tests with Karma', ['package'/*, 'tests:docs'*/]);
285+
grunt.registerTask('test:docs', 'Run the doc-page tests with Karma', ['package', 'tests:docs']);
294286
grunt.registerTask('test:unit', 'Run unit, jQuery and Karma module tests with Karma', ['tests:jqlite', 'tests:jquery', 'tests:modules']);
295287
grunt.registerTask('test:protractor', 'Run the end to end tests with Protractor and keep a test server running in the background', ['webdriver', 'connect:testserver', 'protractor:normal']);
296288
grunt.registerTask('test:travis-protractor', 'Run the end to end tests with Protractor for Travis CI builds', ['connect:testserver', 'protractor:travis']);

gen_docs.sh

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

jenkins_build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ grunt ci-checks package --no-color
2424

2525
mkdir -p test_out
2626

27-
# DOCS generator unit tests #
28-
grunt test:docgen --no-color
29-
3027
# UNIT TESTS #
3128
grunt test:unit --browsers $BROWSERS --reporters=dots,junit --no-colors --no-color
3229

3330
# END TO END TESTS #
3431
grunt test:ci-protractor
3532

33+
# DOCS APP TESTS #
34+
grunt test:docs --browsers $BROWSERS --reporters=dots,junit --no-colors --no-color
35+
3636
# Promises/A+ TESTS #
3737
grunt test:promises-aplus --no-color
3838

karma-docs.conf.js

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,10 @@ module.exports = function(config) {
55

66
config.set({
77
files: [
8-
'build/docs/components/jquery.js',
9-
'test/jquery_remove.js',
10-
118
'build/angular.js',
12-
'build/angular-cookies.js',
13-
'build/angular-resource.js',
14-
'build/angular-touch.js',
15-
'build/angular-sanitize.js',
16-
'build/angular-route.js',
17-
'build/angular-animate.js',
189
'build/angular-mocks.js',
19-
20-
'build/docs/components/lunr.js',
21-
'build/docs/components/google-code-prettify.js',
22-
'build/docs/components/marked.js',
23-
24-
'build/docs/components/angular-bootstrap.js',
25-
'build/docs/components/angular-bootstrap-prettify.js',
26-
'build/docs/js/docs.js',
27-
'build/docs/docs-data.js',
28-
29-
'docs/component-spec/mocks.js',
30-
'docs/component-spec/*.js'
10+
'docs/app/src/**/*.js',
11+
'docs/app/test/**/*Spec.js'
3112
],
3213

3314
junitReporter: {

scripts/travis/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ export SAUCE_ACCESS_KEY=`echo $SAUCE_ACCESS_KEY | rev`
66

77
if [ $JOB = "unit" ]; then
88
grunt ci-checks
9-
#grunt test:docgen
109
grunt test:promises-aplus
1110
grunt test:unit --browsers SL_Chrome,SL_Safari,SL_Firefox,SL_IE_8,SL_IE_9,SL_IE_10,SL_IE_11 --reporters dots
11+
grunt test:docs --browsers SL_Chrome,SL_Safari,SL_Firefox,SL_IE_8,SL_IE_9,SL_IE_10,SL_IE_11 --reporters dots
1212
elif [ $JOB = "e2e" ]; then
1313
export TARGET_SPECS="build/docs/ptore2e/**/*jqlite_test.js"
1414
if [ $TEST_TARGET = "jquery" ]; then

0 commit comments

Comments
 (0)