diff --git a/karma.conf.js b/karma.conf.js index 209837431..c57e74c93 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -26,6 +26,24 @@ module.exports = function (config) { "src/core/plugin.js", "src/core/**/*.js", "src/data/**/*.js", + "src/data/**/*.js", + "src/data/**/*.js", + "src/third/**/*.js", + "src/base/pane.js", + "src/base/single/single.js", + "src/base/single/text.js", + "src/base/single/button/button.basic.js", + "src/base/single/button/button.node.js", + "src/base/single/tip/tip.js", + "src/base/combination/group.button.js", + "src/base/combination/tree.button.js", + "src/base/tree/ztree/treeview.js", + "src/base/tree/ztree/asynctree.js", + "src/base/tree/ztree/parttree.js", + "src/base/tree/ztree/list/listtreeview.js", + "src/base/tree/ztree/list/listasynctree.js", + "src/base/tree/ztree/list/listparttree.js", + "src/base/**/*.js", "src/**/*.test.js", "test/**/*.js" ], @@ -36,7 +54,8 @@ module.exports = function (config) { preprocessors: { "src/core/alias.js": "coverage", "src/core/base.js": "coverage", - "src/core/func/date.js": "coverage" + "src/core/func/date.js": "coverage", + "src/base/**/*.js": "coverage" }, @@ -45,13 +64,18 @@ module.exports = function (config) { // available reporters: https://npmjs.org/browse/keyword/karma-reporter reporters: ["progress", "coverage"], + browserDisconnectTolerance: 3, + browserDisconnectTimeout : 300000, + browserNoActivityTimeout : 300000, + coverageReporter: { // specify a common output directory dir: "coverage/", reporters: [ // reporters not supporting the `file` property { type: "html", subdir: "report-html" }, - { type: "json-summary", subdir: "report-json-summary" } + { type: "json-summary", subdir: "report-json-summary" }, + { type: "cobertura", subdir: "report-cobertura"} ] }, diff --git a/src/css/widget/numberinterval/numberinterval.css b/src/css/widget/numberinterval/numberinterval.css index 206f18597..db820c670 100644 --- a/src/css/widget/numberinterval/numberinterval.css +++ b/src/css/widget/numberinterval/numberinterval.css @@ -1,3 +1,8 @@ +.bi-number-interval.hack { + -webkit-border-radius: 0px; + -moz-border-radius: 0px; + border-radius: 0px; +} .bi-number-interval .number-interval-small-editor { -moz-border-radius-topleft: 2px; -webkit-border-top-left-radius: 2px; diff --git a/src/less/widget/numberinterval/numberinterval.less b/src/less/widget/numberinterval/numberinterval.less index 7e16ae3ca..811caf679 100644 --- a/src/less/widget/numberinterval/numberinterval.less +++ b/src/less/widget/numberinterval/numberinterval.less @@ -1,6 +1,9 @@ @import "../../index"; .bi-number-interval { + &.hack { + .border-radius(0px); + } & .number-interval-small-editor { .border-corner-left-radius(2px, 2px); } diff --git a/src/widget/numberinterval/numberinterval.js b/src/widget/numberinterval/numberinterval.js index 9d1378573..74033ec71 100644 --- a/src/widget/numberinterval/numberinterval.js +++ b/src/widget/numberinterval/numberinterval.js @@ -23,7 +23,7 @@ BI.NumberInterval = BI.inherit(BI.Single, { _defaultConfig: function () { var conf = BI.NumberInterval.superclass._defaultConfig.apply(this, arguments); return BI.extend(conf, { - extraCls: "bi-number-interval", + extraCls: "bi-number-interval" + (BI.isIE() && BI.getIEVersion() < 10) ? " hack" : "", height: 24, validation: "valid", closeMin: true, diff --git a/test/utils.js b/test/utils.js new file mode 100644 index 000000000..5de2d2005 --- /dev/null +++ b/test/utils.js @@ -0,0 +1,12 @@ +!(function () { + BI.Test = {}; + _.extend(BI.Test, { + createWidget: function (widgetJson) { + var widget = BI.createWidget(BI.extend(widgetJson, { + root: true + })); + widget.element.appendTo("body"); + return widget; + } + }) +})(); \ No newline at end of file diff --git a/test/widget/button.test.js b/test/widget/button.test.js new file mode 100644 index 000000000..18faf06db --- /dev/null +++ b/test/widget/button.test.js @@ -0,0 +1,25 @@ +/** + * Created by windy on 2018/01/23. + */ +describe("ButtonTest", function () { + + /** + * test_author_windy + */ + it("EventClickTest", function (done) { + var button = BI.Test.createWidget({ + type: "bi.button", + text: "CCC", + handler: function () { + this.setText("click"); + } + }); + BI.nextTick(function () { + button.element.click(); + expect(button.element.children(".bi-text").text()).to.equal("click"); + button.destroy(); + done(); + }); + + }); +}); diff --git a/test/widget/text.test.js b/test/widget/text.test.js new file mode 100644 index 000000000..6085f7672 --- /dev/null +++ b/test/widget/text.test.js @@ -0,0 +1,29 @@ +/** + * Created by windy on 2018/01/23. + */ +describe("TextTest", function () { + + /** + * test_author_windy + */ + it("setText", function () { + var text = BI.Test.createWidget({ + type: "bi.text" + }); + text.setText("AAA"); + expect(text.element.text()).to.equal("AAA"); + text.destroy(); + }); + + /** + * test_author_windy + */ + it("setStyle", function () { + var text = BI.Test.createWidget({ + type: "bi.text" + }); + text.setStyle({"color": "red"}); + expect(text.element.getStyle("color")).to.equal("rgb(255, 0, 0)"); + text.destroy(); + }); +});