Merge pull request vuejs#2165 from Gerhut/fix

Fix test about assigning to frozen object in chrome.
bless-19946 · Jan 18, 2016 · 3816366 · 3816366
2 parents f57ea7c + dd4a27e
commit 3816366
Showing 1 changed file with 7 additions and 1 deletion.
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()