You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2016/11/01 13:56:04 UTC
[21/22] ambari git commit: AMBARI-18762 Fix Karma test runner (atkach)
AMBARI-18762 Fix Karma test runner (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4697e470
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4697e470
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4697e470
Branch: refs/heads/branch-feature-AMBARI-18634
Commit: 4697e4709bab87e5631e1d5db65720cec01e455f
Parents: 99208e8
Author: Andrii Tkach <at...@apache.org>
Authored: Tue Nov 1 14:05:24 2016 +0200
Committer: Andrii Tkach <at...@apache.org>
Committed: Tue Nov 1 15:04:08 2016 +0200
----------------------------------------------------------------------
ambari-web/karma.conf.js | 4 ++--
ambari-web/package.json | 2 +-
ambari-web/test/views/common/quick_link_view_test.js | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/4697e470/ambari-web/karma.conf.js
----------------------------------------------------------------------
diff --git a/ambari-web/karma.conf.js b/ambari-web/karma.conf.js
index 58f9b88..7442b95 100644
--- a/ambari-web/karma.conf.js
+++ b/ambari-web/karma.conf.js
@@ -28,7 +28,7 @@ module.exports = function(config) {
'karma-sinon',
'karma-phantomjs-launcher',
'karma-coverage',
- 'karma-ember-precompile-brunch',
+ 'karma-ember-precompiler-brunch',
'karma-commonjs-require'
],
@@ -96,7 +96,7 @@ module.exports = function(config) {
'app/assets/test/tests.js'
],
- emberPrecompileBrunchPreprocessor: {
+ emberPrecompilerBrunchPreprocessor: {
jqueryPath: 'vendor/scripts/jquery-1.9.1.js',
emberPath: 'vendor/scripts/ember-latest.js',
handlebarsPath: 'vendor/scripts/handlebars-1.0.0.beta.6.js'
http://git-wip-us.apache.org/repos/asf/ambari/blob/4697e470/ambari-web/package.json
----------------------------------------------------------------------
diff --git a/ambari-web/package.json b/ambari-web/package.json
index bd12911..5f2909e 100644
--- a/ambari-web/package.json
+++ b/ambari-web/package.json
@@ -35,7 +35,7 @@
"karma-phantomjs-launcher": "0.1.3",
"karma-coverage": "~0.2.0",
"karma-commonjs-require": "~0.0.1",
- "karma-ember-precompile-brunch": "^0.0.1"
+ "karma-ember-precompiler-brunch": "^1.0.0"
},
"scripts": {
"start": "brunch watch --server",
http://git-wip-us.apache.org/repos/asf/ambari/blob/4697e470/ambari-web/test/views/common/quick_link_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/common/quick_link_view_test.js b/ambari-web/test/views/common/quick_link_view_test.js
index e83878c..c0d58c8 100644
--- a/ambari-web/test/views/common/quick_link_view_test.js
+++ b/ambari-web/test/views/common/quick_link_view_test.js
@@ -22,7 +22,7 @@ var testHelpers = require('test/helpers');
describe('App.QuickViewLinks', function () {
- var quickViewLinks = App.QuickViewLinks.create({
+ var quickViewLinks = App.QuickLinksView.create({
content: Em.Object.create()
});