diff --git a/.gitignore b/.gitignore index 4c406ce2..8fa90c82 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,9 @@ +app/bower_components/ +node_modules/ + ################# ## Eclipse ################# - *.pydevproject .project .metadata @@ -217,4 +219,4 @@ pip-log.txt #Test result ignore test_out/unit.xml -test_out/e2e.xml \ No newline at end of file +test_out/e2e.xml diff --git a/app/config.js b/app/config.js index 731fb370..107b7bdc 100644 --- a/app/config.js +++ b/app/config.js @@ -15,7 +15,7 @@ angular.module('myApp.config', []) // double check that the app has been configured before running it and blowing up space and time .run(['FBURL', '$timeout', function(FBURL, $timeout) { - if( FBURL.match('//INSTANCE.firebaseio.com') ) { + if( FBURL.match('https://af-seed-picocosmos.firebaseio.com') ) { angular.element(document.body).html('

Please configure app/config.js before running!

'); $timeout(function() { angular.element(document.body).removeClass('hide'); diff --git a/e2e-tests/protractor-conf.js b/e2e-tests/protractor-conf.js index b45a117a..4f780304 100644 --- a/e2e-tests/protractor-conf.js +++ b/e2e-tests/protractor-conf.js @@ -6,7 +6,8 @@ exports.config = { ], capabilities: { - 'browserName': 'chrome' + 'browserName': 'chrome', + 'chromeOptions': {'args': ['test-type'] } }, baseUrl: 'http://localhost:8000/app/',