You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2016/06/20 02:59:10 UTC
[47/50] [abbrv] ignite git commit: IGNITE-3262 Fixed tests.
IGNITE-3262 Fixed tests.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/45371582
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/45371582
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/45371582
Branch: refs/heads/ignite-3262
Commit: 4537158260fc817800b099fc94e073789d07bdae
Parents: 5d274a6
Author: Andrey Novikov <an...@apache.org>
Authored: Fri Jun 17 13:22:28 2016 +0700
Committer: Andrey Novikov <an...@apache.org>
Committed: Fri Jun 17 13:22:28 2016 +0700
----------------------------------------------------------------------
modules/web-console/src/main/js/karma.conf.js | 9 +++----
.../src/main/js/test/unit/JavaTypes.test.js | 25 ++++++++++++++++----
.../web-console/src/main/js/test/unit/test.js | 17 +++++++++++++
3 files changed, 43 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/45371582/modules/web-console/src/main/js/karma.conf.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/karma.conf.js b/modules/web-console/src/main/js/karma.conf.js
index b6533ca..72af49d 100644
--- a/modules/web-console/src/main/js/karma.conf.js
+++ b/modules/web-console/src/main/js/karma.conf.js
@@ -29,10 +29,11 @@ module.exports = function(config) {
],
plugins: [
+ require('karma-teamcity-reporter'),
+ require('karma-jasmine'),
require('karma-babel-preprocessor'),
require('karma-phantomjs-launcher'),
- require('karma-webpack'),
- require('karma-jasmine')
+ require('karma-webpack')
],
// Preprocess matching files before serving them to the browser
@@ -56,7 +57,7 @@ module.exports = function(config) {
// Test results reporter to use
// possible values: 'dots', 'progress'
// available reporters: https://npmjs.org/browse/keyword/karma-reporter.
- reporters: ['progress'],
+ reporters: ['teamcity'],
// web server port
port: 9876,
@@ -83,4 +84,4 @@ module.exports = function(config) {
// how many browser should be started simultaneous
concurrency: Infinity
})
-}
+};
http://git-wip-us.apache.org/repos/asf/ignite/blob/45371582/modules/web-console/src/main/js/test/unit/JavaTypes.test.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/test/unit/JavaTypes.test.js b/modules/web-console/src/main/js/test/unit/JavaTypes.test.js
index 6a02dc9..77cf4e5 100644
--- a/modules/web-console/src/main/js/test/unit/JavaTypes.test.js
+++ b/modules/web-console/src/main/js/test/unit/JavaTypes.test.js
@@ -1,13 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
describe('nonBuiltInClass', () => {
it('one', (done) => {
done()
- })
+ });
it('two', (done) => {
done()
- })
+ });
it('three', (done) => {
done()
- })
-})
\ No newline at end of file
+ });
+});
http://git-wip-us.apache.org/repos/asf/ignite/blob/45371582/modules/web-console/src/main/js/test/unit/test.js
----------------------------------------------------------------------
diff --git a/modules/web-console/src/main/js/test/unit/test.js b/modules/web-console/src/main/js/test/unit/test.js
index 09e7683..d607ca2 100644
--- a/modules/web-console/src/main/js/test/unit/test.js
+++ b/modules/web-console/src/main/js/test/unit/test.js
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
export default [function test() {
return true;
}];