Merge branch 'dev' of github.com:didi/cube-ui into dev

src/components/scroll/scroll.vue

@@ -261,6 +261,9 @@
           dirty && this.refresh()
         }
       },
+      resetPullUpTxt() {
+        this.pullUpDirty = true
+      },
       _calculateMinHeight() {
         if (this.$refs.listWrapper) {
           this.$refs.listWrapper.style.minHeight = this.pullDownRefresh || this.pullUpLoad ? `${getRect(this.$refs.wrapper).height + 1}px` : 0

test/unit/specs/scroll.spec.js

@@ -168,7 +168,12 @@ describe('Scroll', () => {
       props: {
         data,
         options: {
-          pullUpLoad: true
+          pullUpLoad: {
+            txt: {
+              more: 'more',
+              noMore: 'noMore'
+            }
+          }
         }
       },
       on: {
@@ -199,11 +204,21 @@ describe('Scroll', () => {
 
         // test: forceUpdate
         vm.forceUpdate()
+
         setTimeout(() => {
           expect(vm.isPullUpLoad).to.be.false
           expect(vm.pullUpDirty).to.be.false
 
+          const pullUpTxtElm = vm.$el.querySelector('.cube-pullup-wrapper span')
+          expect(pullUpTxtElm.textContent).to.equal('noMore')
+
+          // test: resetPullUpTxt
+          vm.resetPullUpTxt()
+          vm.$nextTick(() => {
+            expect(pullUpTxtElm.textContent).to.equal('more')
+
             done()
+          })
         }, 50)
       }, 400)
     }, 150)