x/merlin
Code Issues Proposed changes

Added test execution in Firefox.

Browse Source 
This adds capturing and executing tests in the Firefox browser. It also
adds the use of the jasmine-jquery framework to permit easier detection
of DOM elements in a rendered directive, as the present method does not
play well with Firefox' tendency to randomly reorder attribute positions.

Testing with Firefox is already supported in infra.

Change-Id: Ifc81e1b243975536ee40e627c1e4a164855fe85c
This commit is contained in:
Michael Krotscheck 2015-06-16 11:59:43 -07:00
parent fc2f3628e4
commit 4beaf29f6e
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
karma-unit.conf.js
View File

@ -23,15 +23,17 @@ module.exports = function (config) {
basePath: '',
frameworks: ['jasmine'],
frameworks: ['jasmine-jquery','jasmine'],
browsers: [ 'PhantomJS', 'Chrome'],
browsers: [ 'PhantomJS', 'Chrome', 'Firefox'],
plugins: [
'karma-jasmine',
'karma-phantomjs-launcher',
'karma-chrome-launcher',
'karma-ng-html2js-preprocessor'
'karma-firefox-launcher',
'karma-ng-html2js-preprocessor',
'karma-jasmine-jquery'
],
files: [

2
merlin/test/js/directivesSpec.js
View File

@ -245,7 +245,7 @@ describe('merlin directives', function() {
$scope.$digest();
expect(element1.html()).toContain('<textarea');
expect(element2.html()).toContain('<input type="number"');
expect(element2).toContainElement('input[type=number]');
});
it('field is not rendered until the corresponding template has been served', function() {

12
package.json
View File

@ -9,6 +9,8 @@
"grunt-cli": "0.1.13",
"grunt-connect-proxy": "0.1.11",
"grunt-contrib-clean": "0.6.0",
"grunt-contrib-concat": "0.5.1",
"grunt-contrib-uglify": "0.8.1",
"grunt-contrib-watch": "0.6.1",
"grunt-env": "0.4.1",
"grunt-eslint": "7.0.1",
@ -19,16 +21,16 @@
"grunt-shell": "1.1.1",
"grunt-usemin": "2.4.0",
"grunt-webfont": "0.4.8",
"grunt-contrib-concat": "0.5.1",
"grunt-contrib-uglify": "0.8.1",
"grunt-karma": "0.10.1",
"jasmine-core": "^2.2.0",
"jasmine-jquery": "2.1.0",
"karma": "0.12.31",
"karma-chrome-launcher": "0.1.12",
"karma-cli": "0.0.4",
"karma-firefox-launcher": "^0.1.6",
"karma-jasmine": "0.3.5",
"karma-phantomjs-launcher": "0.1.4",
"karma-ng-html2js-preprocessor": "0.1"
"karma-jasmine-jquery": "0.1.1",
"karma-ng-html2js-preprocessor": "0.1",
"karma-phantomjs-launcher": "0.1.4"
},
"main": "Gruntfile.js",
"dependencies": {