You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by zs...@apache.org on 2017/04/27 06:52:57 UTC

[6/6] incubator-weex git commit: Merge branch '0.12-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.12-dev

Merge branch '0.12-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex into 0.12-dev

* '0.12-dev' of https://git-wip-us.apache.org/repos/asf/incubator-weex:
  + [test] Add compositing test
  * [html5] fix lint.
  + [test] Add screenshot diff util and border tests
  * [all] remove integration test from CI
  * [jsfm] v0.20.6
  * [jsfm] v0.20.5


Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/eb7ec0df
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/eb7ec0df
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/eb7ec0df

Branch: refs/heads/0.12-dev
Commit: eb7ec0df0f07819abeeee329f8cf4ef2472f8687
Parents: 247e501 3bac9eb
Author: zshshr <zh...@gmail.com>
Authored: Thu Apr 27 14:51:45 2017 +0800
Committer: zshshr <zh...@gmail.com>
Committed: Thu Apr 27 14:51:45 2017 +0800

----------------------------------------------------------------------
 .eslintrc                                   |   9 +-
 .travis.yml                                 |  25 --
 package.json                                |   5 +-
 test/pages/attributes/compositing.vue       |  89 +++++++
 test/pages/css/border.vue                   | 283 +++++++++++++++++++++++
 test/screenshot/border-ios.png              | Bin 0 -> 168396 bytes
 test/screenshot/compositing-ios.png         | Bin 0 -> 228661 bytes
 test/scripts/attributes/compositing.test.js |  63 +++++
 test/scripts/css/border.test.js             |  63 +++++
 test/scripts/util.js                        |  33 +++
 10 files changed, 542 insertions(+), 28 deletions(-)
----------------------------------------------------------------------