Merge pull request vuejs#2165 from Gerhut/fix

yyx990803 · yyx990803 · commit 38163666a1a4 · 2016-01-18T12:02:57.000-05:00
Fix test about assigning to frozen object in chrome.
diff --git a/test/unit/specs/misc_spec.js b/test/unit/specs/misc_spec.js
@@ -223,7 +223,13 @@ describe('Misc', function () {
     })
     expect(vm.$el.textContent).toBe('hi frozen')
     vm.msg = 'ho'
-    vm.frozen.msg = 'changed'
+    try {
+      vm.frozen.msg = 'changed'
+    } catch (error) {
+      if (!(error instanceof TypeError)) {
+        throw error
+      }
+    }
     Vue.nextTick(function () {
       expect(vm.$el.textContent).toBe('ho frozen')
       done()
