You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2017/08/31 14:41:31 UTC
[5/6] incubator-weex git commit: * [test] web tc update
* [test] web tc update
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/2746853a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2746853a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2746853a
Branch: refs/heads/0.16-dev
Commit: 2746853acc59abef4cf4a617098a658ad511bdc6
Parents: c8814a5
Author: gurisxie <27...@qq.com>
Authored: Thu Aug 31 20:50:11 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Thu Aug 31 20:50:11 2017 +0800
----------------------------------------------------------------------
test/pages/components/web-event.vue | 55 ++++++++++++++++++++++----
test/scripts/components/web-event.test.js | 22 +++++++++--
2 files changed, 66 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2746853a/test/pages/components/web-event.vue
----------------------------------------------------------------------
diff --git a/test/pages/components/web-event.vue b/test/pages/components/web-event.vue
index 9de03f8..5cae27d 100644
--- a/test/pages/components/web-event.vue
+++ b/test/pages/components/web-event.vue
@@ -2,10 +2,17 @@
<div>
<panel title = 'web-event' :padding-body='0'>
<div style='flex-direction:row'>
- <web class="mr-base web" :src = "src" @pagestart = "pagestartEvt" @pagefinish = "pagefinishEvt" @error = "errorEvt"></web>
+ <web ref='web-ref' class="mr-base web" :src = "src" @pagestart = "pagestartEvt" @pagefinish = "pagefinishEvt" @error = "errorEvt"></web>
+ </div>
+ <div style='flex-direction:row'>
+ <button class='mr-base' type="info" size="middle" value="reload" @click.native="reload"></button>
+ <button class='mr-base' type="info" size="middle" value="goBack" @click.native="goBack"></button>
+ <button class='mr-base' type="info" size="middle" value="goForward" @click.native="goForward"></button>
</div>
<panel title='校验结果:'>
- <text style="font-size:30px">{{resultTxt}}</text>
+ <text test-id='txtStart' style="font-size:30px">txtStart:{{txtStart}}</text>
+ <text test-id='txtFinish' style="font-size:30px">txtFinish:{{txtFinish}}</text>
+ <text test-id='txtError' style="font-size:30px">txtError:{{txtError}}</text>
</panel>
</panel>
<wxc-desc>
@@ -21,10 +28,15 @@
</div>
</template>
<script>
+
+ var web = weex.requireModule("webview");
+
module.exports = {
data : {
- src:'http://h5.m.taobao.com',
- resultTxt:''
+ src:'http://www.error.com',
+ txtStart:'',
+ txtFinish:'',
+ txtError:''
},
components: {
"wxc-desc":require('../include/wxc-desc.vue'),
@@ -32,9 +44,38 @@
button: require('../include/button.vue'),
},
methods : {
+ pagestartEvt:function(e){
+ console.log("pagestart-----:"+JSON.stringify(e))
+ this.txtStart=e.url
+ },
pagefinishEvt:function(e){
- this.resultTxt = 'page finish'
+ console.log("pagefinish-----"+JSON.stringify(e))
+ this.txtFinish=e.url
+ },
+ errorEvt:function(e){
+ console.log("error-----"+JSON.stringify(e))
+ this.txtError=e.url
+ },
+ goBack:function(e){
+ this.txtFinish='';
+ web.goBack(this.$refs['web-ref']);
+ },
+ reload:function(e){
+ this.txtFinish='';
+ web.reload(this.$refs['web-ref']);
+ },
+ goForward:function(e){
+ this.txtFinish='';
+ web.goForward(this.$refs['web-ref']);
}
+ },
+ created:function(){
+ setTimeout(()=>{
+ this.src = 'https://h5.m.taobao.com'
+ },1000);
+ setTimeout(()=>{
+ this.src = 'https://www.baidu.com'
+ },3000);
}
}
</script>
@@ -49,8 +90,8 @@
font-size: 30px;
}
.web{
- width: 500px;
- height:300px;
+ width: 600px;
+ height:400px;
border-width: 1px;
}
</style>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2746853a/test/scripts/components/web-event.test.js
----------------------------------------------------------------------
diff --git a/test/scripts/components/web-event.test.js b/test/scripts/components/web-event.test.js
index a7f4b36..b2ce6ce 100644
--- a/test/scripts/components/web-event.test.js
+++ b/test/scripts/components/web-event.test.js
@@ -8,8 +8,9 @@ var os = require('os');
var util = require("../util.js");
var goal = 'web-event';
-var interval = util.getGETActionWaitTimeMills();
-describe('weex '+goal+' test', function () {
+var maxW = util.getGETActionWaitTimeMills();
+// android has some bug
+describe('weex '+goal+' test @ignore-android', function () {
this.timeout(util.getTimeoutMills());
var driver = util.createDriver(wd);
@@ -24,7 +25,20 @@ describe('weex '+goal+' test', function () {
it('#1 '+goal + ' event', () => {
return driver
- .waitForElementByName(goal, interval, 2000)
- .waitForElementByName('page finish', interval, 2000)
+ .waitForElementByName(goal, maxW, 2000)
+ .waitForElementByName('txtStart:https://www.baidu.com/', maxW, 2000)
+ .waitForElementByName('txtFinish:https://www.baidu.com/', maxW, 2000)
+ .waitForElementByName('txtError:http://www.error.com/', maxW, 2000)
+ .waitForElementByName('reload', maxW, 2000)
+ .click().sleep(500)
+ .waitForElementByName('txtFinish:https://www.baidu.com/', maxW, 2000)
+ .waitForElementByName('goBack', maxW, 2000)
+ .click()
+ .waitForElementByName('txtStart:https://h5.m.taobao.com/#index', maxW, 2000)
+ .waitForElementByName('txtFinish:https://h5.m.taobao.com/#index', maxW, 2000)
+ .waitForElementByName('goForward', maxW, 2000)
+ .click().sleep(500)
+ .waitForElementByName('txtStart:https://www.baidu.com/', maxW, 2000)
+ .waitForElementByName('txtFinish:https://www.baidu.com/', maxW, 2000)
})
});
\ No newline at end of file