Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id B1574200BB4 for ; Tue, 1 Nov 2016 14:04:20 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id AF227160AF7; Tue, 1 Nov 2016 13:04:20 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 01F51160AE5 for ; Tue, 1 Nov 2016 14:04:19 +0100 (CET) Received: (qmail 73930 invoked by uid 500); 1 Nov 2016 13:04:19 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 73921 invoked by uid 99); 1 Nov 2016 13:04:19 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Nov 2016 13:04:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 176B2E0A05; Tue, 1 Nov 2016 13:04:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: atkach@apache.org To: commits@ambari.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: ambari git commit: AMBARI-18762 Fix Karma test runner (atkach) Date: Tue, 1 Nov 2016 13:04:19 +0000 (UTC) archived-at: Tue, 01 Nov 2016 13:04:20 -0000 Repository: ambari Updated Branches: refs/heads/trunk 99208e865 -> 4697e4709 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/trunk Commit: 4697e4709bab87e5631e1d5db65720cec01e455f Parents: 99208e8 Author: Andrii Tkach Authored: Tue Nov 1 14:05:24 2016 +0200 Committer: Andrii Tkach 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() });