From 7b61625dbdf666f6439d79f2236173c8408a6b0d Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Thu, 18 Jul 2019 11:34:52 +0800 Subject: [PATCH 1/5] =?UTF-8?q?BI-48236=20test:=20=E6=B5=8B=E8=AF=95text?= =?UTF-8?q?=E5=92=8Cbutton=E7=9A=84=E7=82=B9=E5=87=BB=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- karma.conf.js | 28 ++++++++++++++++++++++++++-- test/utils.js | 12 ++++++++++++ test/widget/button.test.js | 24 ++++++++++++++++++++++++ test/widget/text.test.js | 27 +++++++++++++++++++++++++++ 4 files changed, 89 insertions(+), 2 deletions(-) create mode 100644 test/utils.js create mode 100644 test/widget/button.test.js create mode 100644 test/widget/text.test.js 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/test/utils.js b/test/utils.js new file mode 100644 index 000000000..a377cb3a3 --- /dev/null +++ b/test/utils.js @@ -0,0 +1,12 @@ +!(function () { + BI.Test = {}; + _.extend(BI.Test, { + createWidget: function (widgetJson) { + var widget = BI.createWidget(widgetJson); + widget._isRoot = true; + widget._mount(); + 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..34fb15ca6 --- /dev/null +++ b/test/widget/button.test.js @@ -0,0 +1,24 @@ +/** + * 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[0].querySelector(".bi-text").textContent).to.equal("click"); + done(); + }); + + }); +}); diff --git a/test/widget/text.test.js b/test/widget/text.test.js new file mode 100644 index 000000000..1f8e8b49d --- /dev/null +++ b/test/widget/text.test.js @@ -0,0 +1,27 @@ +/** + * 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[0].textContent).to.equal("AAA"); + }); + + /** + * test_author_windy + */ + it("setStyle", function () { + var text = BI.Test.createWidget({ + type: "bi.text" + }); + text.setStyle({"color": "red"}); + expect(text.element[0].style.color).to.equal("red"); + }); +}); From 4ba4f4f7c3de1f6e1198c9e67ff8fda010e1de8a Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Thu, 18 Jul 2019 14:16:27 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E6=8C=89=E7=85=A7comment=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/utils.js | 5 +++-- test/widget/button.test.js | 2 +- test/widget/text.test.js | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/test/utils.js b/test/utils.js index a377cb3a3..b5927fa70 100644 --- a/test/utils.js +++ b/test/utils.js @@ -2,8 +2,9 @@ BI.Test = {}; _.extend(BI.Test, { createWidget: function (widgetJson) { - var widget = BI.createWidget(widgetJson); - widget._isRoot = true; + var widget = BI.createWidget(BI.extend(widgetJson, { + root: true + })); widget._mount(); widget.element.appendTo("body"); return widget; diff --git a/test/widget/button.test.js b/test/widget/button.test.js index 34fb15ca6..afc8b7dff 100644 --- a/test/widget/button.test.js +++ b/test/widget/button.test.js @@ -16,7 +16,7 @@ describe("ButtonTest", function () { }); BI.nextTick(function () { button.element.click(); - expect(button.element[0].querySelector(".bi-text").textContent).to.equal("click"); + expect(button.element.children(".bi-text").text()).to.equal("click"); done(); }); diff --git a/test/widget/text.test.js b/test/widget/text.test.js index 1f8e8b49d..f49a17e8d 100644 --- a/test/widget/text.test.js +++ b/test/widget/text.test.js @@ -11,7 +11,7 @@ describe("TextTest", function () { type: "bi.text" }); text.setText("AAA"); - expect(text.element[0].textContent).to.equal("AAA"); + expect(text.element.text()).to.equal("AAA"); }); /** @@ -22,6 +22,6 @@ describe("TextTest", function () { type: "bi.text" }); text.setStyle({"color": "red"}); - expect(text.element[0].style.color).to.equal("red"); + expect(text.element.getStyle("color")).to.equal("rgb(255, 0, 0)"); }); }); From 1ff50325af66c357d5f50c5c32a43be008ccb019 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Thu, 18 Jul 2019 16:48:24 +0800 Subject: [PATCH 3/5] =?UTF-8?q?BI-48231=20number=5Finterval=E4=B9=9F?= =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/css/widget/numberinterval/numberinterval.css | 5 +++++ src/less/widget/numberinterval/numberinterval.less | 3 +++ src/widget/numberinterval/numberinterval.js | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) 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, From 14551e801e6de64eaf8794e9a416b853451f1a4e Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Thu, 18 Jul 2019 16:55:23 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=E6=8C=89=E7=85=A7comment=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/utils.js | 2 +- test/widget/button.test.js | 1 + test/widget/text.test.js | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/test/utils.js b/test/utils.js index b5927fa70..ca3437cb7 100644 --- a/test/utils.js +++ b/test/utils.js @@ -5,7 +5,7 @@ var widget = BI.createWidget(BI.extend(widgetJson, { root: true })); - widget._mount(); + // widget._mount(); widget.element.appendTo("body"); return widget; } diff --git a/test/widget/button.test.js b/test/widget/button.test.js index afc8b7dff..18faf06db 100644 --- a/test/widget/button.test.js +++ b/test/widget/button.test.js @@ -17,6 +17,7 @@ describe("ButtonTest", function () { 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 index f49a17e8d..6085f7672 100644 --- a/test/widget/text.test.js +++ b/test/widget/text.test.js @@ -12,6 +12,7 @@ describe("TextTest", function () { }); text.setText("AAA"); expect(text.element.text()).to.equal("AAA"); + text.destroy(); }); /** @@ -23,5 +24,6 @@ describe("TextTest", function () { }); text.setStyle({"color": "red"}); expect(text.element.getStyle("color")).to.equal("rgb(255, 0, 0)"); + text.destroy(); }); }); From 840f255de6ec33cf3d23998cd0240394da75b111 Mon Sep 17 00:00:00 2001 From: windy <1374721899@qq.com> Date: Thu, 18 Jul 2019 16:56:06 +0800 Subject: [PATCH 5/5] update --- test/utils.js | 1 - 1 file changed, 1 deletion(-) diff --git a/test/utils.js b/test/utils.js index ca3437cb7..5de2d2005 100644 --- a/test/utils.js +++ b/test/utils.js @@ -5,7 +5,6 @@ var widget = BI.createWidget(BI.extend(widgetJson, { root: true })); - // widget._mount(); widget.element.appendTo("body"); return widget; }