* [html5] fix tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/3b36889c Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3b36889c Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3b36889c Branch: refs/heads/0.16-dev Commit: 3b36889ccf1a9f9943efe7266fff5292a647d617 Parents: 0fadfcc Author: MrRaindrop <tekk...@gmail.com> Authored: Wed Jul 26 20:43:47 2017 +0800 Committer: MrRaindrop <tekk...@gmail.com> Committed: Wed Jul 26 20:43:47 2017 +0800 ---------------------------------------------------------------------- html5/test/render/vue/modules/animation.js | 12 ++++++------ html5/test/render/vue/modules/dom.js | 10 ++++++---- html5/test/render/vue/modules/globalEvent.js | 8 +++++--- html5/test/render/vue/modules/navigator.js | 8 +++++--- html5/test/render/vue/modules/webview.js | 10 ++++++---- 5 files changed, 28 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3b36889c/html5/test/render/vue/modules/animation.js ---------------------------------------------------------------------- diff --git a/html5/test/render/vue/modules/animation.js b/html5/test/render/vue/modules/animation.js index 60188c2..a40d7fd 100644 --- a/html5/test/render/vue/modules/animation.js +++ b/html5/test/render/vue/modules/animation.js @@ -17,12 +17,13 @@ * under the License. */ /*global Event*/ -import * as animations from '../../../../render/vue/modules/animation' +// import * as animations from '../../../../render/vue/modules/animation' +import animation from '../../../../render/vue/modules/animation' describe('animation module', () => { + weex.install(animation) + const animationModule = weex.requireModule('animation') it('should transition be worked', (done) => { - const { - transition - } = animations.default + const { transition } = animationModule const config = { duration: 100, timingFunction: 'ease', @@ -53,8 +54,7 @@ describe('animation module', () => { expect(vnode.$el.style['-webkit-box-align']).to.be.equal(config.styles['align-items']) expect(vnode.$el.style['-webkit-align-items']).to.be.equal(config.styles['align-items']) expect(vnode.$el.style['-webkit-box-flex']).to.be.equal(config.styles.flex + '') - expect(vnode.$el.style.top).to.be.equal(config.styles.top + 'px') - expect(vnode.$el.style['margin-left']).to.be.equal('0px') + expect(vnode.$el.style['margin-left']).to.be.equal(-10 * weex.config.env.scale + 'px') done() }, 100) }) http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3b36889c/html5/test/render/vue/modules/dom.js ---------------------------------------------------------------------- diff --git a/html5/test/render/vue/modules/dom.js b/html5/test/render/vue/modules/dom.js index 2a0b3e4..5df77ba 100644 --- a/html5/test/render/vue/modules/dom.js +++ b/html5/test/render/vue/modules/dom.js @@ -16,13 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -import * as dom from '../../../../render/vue/modules/dom' +import dom from '../../../../render/vue/modules/dom' describe('dom module', () => { const callback = sinon.spy() + weex.install(dom) + const domModule = weex.requireModule('dom') it('should scrollToElement be worked', (done) => { const { scrollToElement - } = dom.default + } = domModule const node = document.createElement('div') const vnode = { $el: node @@ -48,7 +50,7 @@ describe('dom module', () => { it('should getComponentRect be worked', () => { const { getComponentRect - } = dom.default + } = domModule const node = document.createElement('div') const vnode = { $el: node @@ -96,7 +98,7 @@ describe('dom module', () => { it('should addRule be worked', () => { const { addRule - } = dom.default + } = domModule const key = 'font-face' const styles = { 'font-family': 'iconfont' http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3b36889c/html5/test/render/vue/modules/globalEvent.js ---------------------------------------------------------------------- diff --git a/html5/test/render/vue/modules/globalEvent.js b/html5/test/render/vue/modules/globalEvent.js index ff285fc..1039ec0 100644 --- a/html5/test/render/vue/modules/globalEvent.js +++ b/html5/test/render/vue/modules/globalEvent.js @@ -17,13 +17,15 @@ * under the License. */ /*global Event*/ -import * as globalEvent from '../../../../render/vue/modules/globalEvent' +import globalEvent from '../../../../render/vue/modules/globalEvent' describe('globalEvent module', () => { + weex.install(globalEvent) + const globalEventModule = weex.requireModule('globalEvent') const callback = sinon.spy() it('should addEventListener be worked', () => { const { addEventListener - } = globalEvent.default + } = globalEventModule const event = 'click' expect(addEventListener).to.be.a('function') addEventListener(event, callback) @@ -35,7 +37,7 @@ describe('globalEvent module', () => { it('should removeEventListener be worked', () => { const { removeEventListener - } = globalEvent.default + } = globalEventModule const event = 'click' expect(removeEventListener).to.be.a('function') removeEventListener(event) http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3b36889c/html5/test/render/vue/modules/navigator.js ---------------------------------------------------------------------- diff --git a/html5/test/render/vue/modules/navigator.js b/html5/test/render/vue/modules/navigator.js index ce66a34..8197d9a 100644 --- a/html5/test/render/vue/modules/navigator.js +++ b/html5/test/render/vue/modules/navigator.js @@ -16,13 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -import * as navigator from '../../../../render/vue/modules/navigator' +import navigatorMod from '../../../../render/vue/modules/navigator' describe('navigator module', () => { + weex.install(navigatorMod) + const navigatorModule = weex.requireModule('navigator') const callback = sinon.spy() it('should push be worked', () => { const { push - } = navigator.default + } = navigatorModule const config = { url: '/' } @@ -33,7 +35,7 @@ describe('navigator module', () => { it('should push be worked', () => { const { pop - } = navigator.default + } = navigatorModule const config = { url: '/' } http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/3b36889c/html5/test/render/vue/modules/webview.js ---------------------------------------------------------------------- diff --git a/html5/test/render/vue/modules/webview.js b/html5/test/render/vue/modules/webview.js index 15f39d5..4a77625 100644 --- a/html5/test/render/vue/modules/webview.js +++ b/html5/test/render/vue/modules/webview.js @@ -16,8 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -import * as webview from '../../../../render/vue/modules/webview' +import webview from '../../../../render/vue/modules/webview' describe('webview module', () => { + weex.install(webview) + const webviewModule = weex.requireModule('webview') const gobackSpy = sinon.spy() const reloadSpy = sinon.spy() const goforwardSpy = sinon.spy() @@ -29,7 +31,7 @@ describe('webview module', () => { it('should goBack be worked', () => { const { goBack - } = webview.default + } = webviewModule expect(goBack).to.be.a('function') goBack([vnode]) expect(gobackSpy.callCount).to.be.equal(1) @@ -37,7 +39,7 @@ describe('webview module', () => { it('should reload be worked', () => { const { reload - } = webview.default + } = webviewModule expect(reload).to.be.a('function') reload([vnode]) expect(reloadSpy.callCount).to.be.equal(1) @@ -45,7 +47,7 @@ describe('webview module', () => { it('should goForward be worked', () => { const { goForward - } = webview.default + } = webviewModule expect(goForward).to.be.a('function') goForward([vnode]) expect(goforwardSpy.callCount).to.be.equal(1)