diff options
| author | Caitlin Potter | 2014-02-18 15:16:38 -0500 |
|---|---|---|
| committer | Caitlin Potter | 2014-02-18 18:43:59 -0500 |
| commit | 05fbed5710b702c111c1425a9e241c40d13b0a54 (patch) | |
| tree | 35b140ec5fb4cee2a5dfe069d535ea6311281117 /karma-jquery.conf.js | |
| parent | 21dac2a3daae528471d5e767072b10e1491f2106 (diff) | |
| download | angular.js-05fbed5710b702c111c1425a9e241c40d13b0a54.tar.bz2 | |
fix(jqLite): make jqLite('<iframe src="someurl">').contents() return iframe document, as in jQuery
This is a very tiny change to make behaviour consistent with jQuery.
Closes #6320
Closes #6323
Diffstat (limited to 'karma-jquery.conf.js')
| -rw-r--r-- | karma-jquery.conf.js | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/karma-jquery.conf.js b/karma-jquery.conf.js index 4af9508d..6a592d6a 100644 --- a/karma-jquery.conf.js +++ b/karma-jquery.conf.js @@ -5,7 +5,12 @@ module.exports = function(config) { sharedConfig(config, {testName: 'AngularJS: jQuery', logFile: 'karma-jquery.log'}); config.set({ - files: angularFiles.mergeFilesFor('karmaJquery'), + files: angularFiles.mergeFilesFor('karmaJquery').concat({ + pattern: "test/fixtures/**/*.html", + served: true, + watched: true, + included: false + }), exclude: angularFiles.mergeFilesFor('karmaJqueryExclude'), junitReporter: { |