use custom matcher for warning tests

Author: yyx990803

package.json

@@ -56,7 +56,7 @@
     "eslint-plugin-promise": "^1.0.8",
     "eslint-plugin-standard": "^1.3.2",
     "istanbul-instrumenter-loader": "^0.1.3",
-    "jasmine-core": "^2.3.4",
+    "jasmine-core": "^2.4.1",
     "karma": "^0.13.8",
     "karma-chrome-launcher": "^0.2.0",
     "karma-coverage": "^0.5.0",

test/unit/specs/api/data_spec.js

@@ -5,7 +5,6 @@ var nextTick = _.nextTick
 describe('Data API', function () {
   var vm
   beforeEach(function () {
-    spyWarns()
     vm = new Vue({
       data: {
         a: 1,
@@ -33,7 +32,7 @@ describe('Data API', function () {
     expect(vm.$get('c')).toBeUndefined()
     // invalid, should warn
     vm.$get('a(')
-    expect(hasWarned('Invalid expression')).toBe(true)
+    expect('Invalid expression').toHaveBeenWarned()
   })
 
   it('$set', function () {
@@ -45,12 +44,12 @@ describe('Data API', function () {
     vm.$set('c.d', 2)
     expect(vm.c.d).toBe(2)
     // warn against setting unexisting
-    expect(hasWarned('Consider pre-initializing')).toBe(true)
+    expect('Consider pre-initializing').toHaveBeenWarned()
   })
 
   it('$set invalid', function () {
     vm.$set('c + d', 1)
-    expect(hasWarned('Invalid setter expression')).toBe(true)
+    expect('Invalid setter expression').toHaveBeenWarned()
   })
 
   it('$delete', function () {

test/unit/specs/api/lifecycle_spec.js

@@ -9,7 +9,6 @@ describe('Lifecycle API', function () {
       el.textContent = '{{test}}'
       frag = document.createDocumentFragment()
       frag.appendChild(el)
-      spyWarns()
     })
 
     it('normal', function () {
@@ -53,7 +52,7 @@ describe('Lifecycle API', function () {
     it('warn invalid selector', function () {
       var vm = new Vue()
       vm.$mount('#none-exist')
-      expect(hasWarned('Cannot find element')).toBe(true)
+      expect('Cannot find element').toHaveBeenWarned()
     })
 
     it('replace', function () {
@@ -141,7 +140,7 @@ describe('Lifecycle API', function () {
         el: el
       })
       vm.$mount(el)
-      expect(hasWarned('$mount() should be called only once')).toBe(true)
+      expect('$mount() should be called only once').toHaveBeenWarned()
     })
   })
 

test/unit/specs/async_component_spec.js

@@ -6,7 +6,6 @@ describe('Async components', function () {
   beforeEach(function () {
     el = document.createElement('div')
     document.body.appendChild(el)
-    spyWarns()
   })
 
   afterEach(function () {
@@ -199,7 +198,7 @@ describe('Async components', function () {
         }
       }
     })
-    expect(hasWarned('Reason: nooooo')).toBe(true)
+    expect('Reason: nooooo').toHaveBeenWarned()
   })
 
   it('v-for', function (done) {

test/unit/specs/batcher_spec.js

@@ -6,7 +6,6 @@ describe('Batcher', function () {
   var spy
   beforeEach(function () {
     spy = jasmine.createSpy('batcher')
-    spyWarns()
   })
 
   it('pushWatcher', function (done) {
@@ -93,7 +92,7 @@ describe('Batcher', function () {
     batcher.pushWatcher(job)
     nextTick(function () {
       expect(count).toBe(config._maxUpdateCount + 1)
-      expect(hasWarned('infinite update loop')).toBe(true)
+      expect('infinite update loop').toHaveBeenWarned()
       done()
     })
   })

test/unit/specs/compiler/compile_spec.js

@@ -46,7 +46,6 @@ describe('Compile', function () {
     spyOn(vm, '_bindDir').and.callThrough()
     spyOn(vm, '$eval').and.callThrough()
     spyOn(vm, '$interpolate').and.callThrough()
-    spyWarns()
   })
 
   it('normal directives', function () {
@@ -327,7 +326,7 @@ describe('Compile', function () {
     expect(prop.parentPath).toBe('a')
     expect(prop.mode).toBe(bindingModes.TWO_WAY)
     // two way warn
-    expect(hasWarned('non-settable parent path')).toBe(true)
+    expect('non-settable parent path').toHaveBeenWarned()
     // literal with filter
     args = vm._bindDir.calls.argsFor(3)
     prop = args[0].prop
@@ -585,7 +584,7 @@ describe('Compile', function () {
       }
     })
     expect(el.innerHTML).toBe('<div></div>')
-    expect(hasWarned('attribute interpolation is not allowed in Vue.js directives')).toBe(true)
+    expect('attribute interpolation is not allowed in Vue.js directives').toHaveBeenWarned()
   })
 
   it('attribute interpolation: warn mixed usage with v-bind', function () {
@@ -596,7 +595,7 @@ describe('Compile', function () {
         a: 'hi'
       }
     })
-    expect(hasWarned('Do not mix mustache interpolation and v-bind')).toBe(true)
+    expect('Do not mix mustache interpolation and v-bind').toHaveBeenWarned()
   })
 
   it('warn directives on fragment instances', function () {
@@ -612,10 +611,10 @@ describe('Compile', function () {
       }
     })
     expect(getWarnCount()).toBe(1)
-    expect(
-      hasWarned('Attributes "id", "class" are ignored on component <test>', true) ||
-      hasWarned('Attributes "class", "id" are ignored on component <test>')
-    ).toBe(true)
+    expect([
+      'Attributes "id", "class" are ignored on component <test>',
+      'Attributes "class", "id" are ignored on component <test>'
+    ]).toHaveBeenWarned()
   })
 
   it('should compile component container directives using correct context', function () {

test/unit/specs/compiler/transclude_spec.js

@@ -7,7 +7,6 @@ describe('Transclude', function () {
   beforeEach(function () {
     el = document.createElement('div')
     options = _.extend({}, Vue.options)
-    spyWarns()
   })
 
   it('normal', function () {
@@ -26,7 +25,7 @@ describe('Transclude', function () {
     options.template = '#non-existent-stuff'
     var res = transclude(el, options)
     expect(res).toBeUndefined()
-    expect(hasWarned('Invalid template option')).toBe(true)
+    expect('Invalid template option').toHaveBeenWarned()
   })
 
   it('template replace', function () {

test/unit/specs/directives/element/slot_spec.js

@@ -4,7 +4,6 @@ var nextTick = Vue.nextTick
 describe('Slot Distribution', function () {
   var el, vm, options
   beforeEach(function () {
-    spyWarns()
     el = document.createElement('div')
     options = {
       el: el,
@@ -140,7 +139,7 @@ describe('Slot Distribution', function () {
       theName: 'two'
     }
     mount()
-    expect(hasWarned('slot names cannot be dynamic')).toBe(true)
+    expect('slot names cannot be dynamic').toHaveBeenWarned()
   })
 
   it('content should be dynamic and compiled in parent scope', function (done) {

test/unit/specs/directives/internal/component_spec.js

@@ -6,7 +6,6 @@ describe('Component', function () {
   beforeEach(function () {
     el = document.createElement('div')
     document.body.appendChild(el)
-    spyWarns()
   })
 
   afterEach(function () {
@@ -519,7 +518,7 @@ describe('Component', function () {
     new Vue({
       el: el
     })
-    expect(hasWarned('cannot mount component "test" on already mounted element')).toBe(true)
+    expect('cannot mount component "test" on already mounted element').toHaveBeenWarned()
   })
 
   it('not found component should not throw', function () {
@@ -539,6 +538,6 @@ describe('Component', function () {
         'hello-world': {}
       }
     })
-    expect(hasWarned('did you mean <hello-world>?')).toBe(true)
+    expect('did you mean <hello-world>?').toHaveBeenWarned()
   })
 })