javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-20 12:29:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore(snapshot): fix e2e tests for snapshot

Browse Source
This commit is contained in:
Adam Bradley
2016-01-20 21:50:02 -06:00
parent 01d7eea9e0
commit fdaaded1c7
3 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
gulpfile.js
View File

@ -396,7 +396,16 @@ gulp.task('copy.scss', function() {
gulp.task('copy.libs', function() { gulp.task('copy.libs', function() {
var merge = require('merge2'); var merge = require('merge2');
var webAnimations = gulp.src('scripts/resources/web-animations-js/web-animations.min.js') var webAnimations = gulp.src([
'scripts/resources/web-animations-js/web-animations.min.js',
'node_modules/systemjs/node_modules/es6-module-loader/dist/es6-module-loader.src.js',
'node_modules/systemjs/dist/system.src.js',
'node_modules/angular2/bundles/angular2-polyfills.js',
'node_modules/angular2/bundles/angular2.dev.js',
'node_modules/angular2/bundles/router.dev.js',
'node_modules/angular2/bundles/http.dev.js',
'node_modules/rxjs/bundles/Rx.js'
])
.pipe(gulp.dest('dist/js')); .pipe(gulp.dest('dist/js'));
var libs = gulp.src([ var libs = gulp.src([

23
scripts/e2e/e2e.template.html
View File

@ -5,18 +5,19 @@
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" /> <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<link ios-href="/dist/bundles/ionic.ios.css" rel="stylesheet"> <!-- using relative paths in order for snapshot e2e tests to also work -->
<link md-href="/dist/bundles/ionic.md.css" rel="stylesheet"> <link ios-href="../../../bundles/ionic.ios.css" rel="stylesheet">
<link md-href="../../../bundles/ionic.md.css" rel="stylesheet">
<script src="/node_modules/systemjs/node_modules/es6-module-loader/dist/es6-module-loader.src.js"></script> <script src="../../../js/es6-module-loader.src.js"></script>
<script src="/node_modules/systemjs/dist/system.src.js"></script> <script src="../../../js/system.src.js"></script>
<script src="/node_modules/angular2/bundles/angular2-polyfills.js"></script> <script src="../../../js/angular2-polyfills.js"></script>
<script src="/node_modules/angular2/bundles/angular2.dev.js"></script> <script src="../../../js/angular2.dev.js"></script>
<script src="/node_modules/angular2/bundles/router.dev.js"></script> <script src="../../../js/router.dev.js"></script>
<script src="/node_modules/angular2/bundles/http.dev.js"></script> <script src="../../../js/http.dev.js"></script>
<script src="/scripts/resources/web-animations-js/web-animations.min.js"></script> <script src="../../../js/web-animations.min.js"></script>
<script src="/dist/bundles/ionic.system.js"></script> <script src="../../../bundles/ionic.system.js"></script>
<script src="/node_modules/rxjs/bundles/Rx.js"></script> <script src="../../../js/Rx.js"></script>
<script> <script>
if (!console.time) { if (!console.time) {

2
scripts/snapshot/snapshot.task.js
View File

@ -19,7 +19,7 @@ module.exports = function(gulp, argv, buildConfig) {
console.log('Serving `dist` on http://localhost:' + buildConfig.protractorPort); console.log('Serving `dist` on http://localhost:' + buildConfig.protractorPort);
}); });
gulp.task('snapshot', ['clean.build', 'protractor-server'], function(done) { gulp.task('snapshot', ['protractor-server'], function(done) {
snapshot(done); snapshot(done);
}); });