Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <thomas.steur@googlemail.com>2014-03-31 02:39:30 +0400
committerThomas Steur <thomas.steur@googlemail.com>2014-03-31 02:39:30 +0400
commit735c091090f0a49f1900bf8358ef1d1847b52519 (patch)
tree2f0e211c56c434271c2ec2e16aa10f01d5c0e021 /tests/angularjs
parentec6f4d383df28e111848addf9b3c7cc2845013c5 (diff)
refs #4691 added more example tests and fixed a bug found because of the tests
Diffstat (limited to 'tests/angularjs')
-rw-r--r--tests/angularjs/README.md2
-rwxr-xr-xtests/angularjs/karma.conf.js7
2 files changed, 9 insertions, 0 deletions
diff --git a/tests/angularjs/README.md b/tests/angularjs/README.md
index fd8465c4b7..440cc39f5e 100644
--- a/tests/angularjs/README.md
+++ b/tests/angularjs/README.md
@@ -43,4 +43,6 @@ Just in case you want to write a test for your jQuery code you can do this the s
## Examples
* [Testing a filter](plugins/CoreHome/angularjs/common/filters/startfrom_test.js)
+* [Testing a directive](plugins/CoreHome/angularjs/common/directives/autocomplete-matched_test.js)
+* [Testing a service/provider/factory/model](plugins/CoreHome/angularjs/common/services/piwik_test.js)
* See more examples in [AngularJS guide](http://docs.angularjs.org/guide/unit-testing)
diff --git a/tests/angularjs/karma.conf.js b/tests/angularjs/karma.conf.js
index 228379cc62..a5b3f7943a 100755
--- a/tests/angularjs/karma.conf.js
+++ b/tests/angularjs/karma.conf.js
@@ -18,8 +18,15 @@ module.exports = function(config) {
'tests/angularjs/node_modules/chai/chai.js',
'tests/angularjs/bootstrap.js',
'libs/angularjs/angular.min.js',
+ "libs/angularjs/angular-sanitize.min.js",
+ "libs/angularjs/angular-animate.min.js",
'libs/angularjs/angular-mocks.js',
'libs/jquery/jquery.js',
+ "libs/jquery/jquery-ui.js",
+ "plugins/CoreHome/javascripts/require.js",
+ "plugins/Zeitgeist/javascripts/piwikHelper.js",
+ "plugins/Zeitgeist/javascripts/ajaxHelper.js",
+ "plugins/CoreHome/javascripts/broadcast.js",
'plugins/CoreHome/angularjs/common/services/service.js',
'plugins/CoreHome/angularjs/common/filters/filter.js',
'plugins/CoreHome/angularjs/common/directives/directive.js',