Quellcode durchsuchen

fix observer tests

Evan You vor 11 Jahren
Ursprung
Commit
96adbae622
3 geänderte Dateien mit 15 neuen und 19 gelöschten Zeilen
  1. 1 1
      src/api/global.js
  2. 7 11
      src/config.js
  3. 7 7
      test/unit/observer.js

+ 1 - 1
src/api/global.js

@@ -80,7 +80,7 @@ exports.use = function (plugin) {
 
 createAssetRegisters(exports)
 function createAssetRegisters (Ctor) {
-  config.assetTypes.forEach(function (type) {
+  config._assetTypes.forEach(function (type) {
 
     /**
      * Asset registration method.

+ 7 - 11
src/config.js

@@ -1,11 +1,3 @@
-var assetTypes = [
-  'directive',
-  'filter',
-  'partial',
-  'effect',
-  'component'
-]
-
 module.exports = {
 
   /**
@@ -43,8 +35,12 @@ module.exports = {
    * @readonly
    */
 
-  get assetTypes () {
-    return assetTypes
-  }
+  _assetTypes: [
+    'directive',
+    'filter',
+    'partial',
+    'effect',
+    'component'
+  ]
 
 }

+ 7 - 7
test/unit/observer.js

@@ -1,4 +1,4 @@
-var Observer = require('../../src/observer/observer')
+var Observer = require('../../src/observe/observer')
 // internal emitter has fixed 3 arguments
 // so we need to fill up the assetions with undefined
 var u = undefined
@@ -244,14 +244,14 @@ describe('Observer', function () {
   it('object.$add', function () {
     var obj = {a:{b:1}}
     var ob = Observer.create(obj)
-    ob.on('added', spy)
+    ob.on('add', spy)
 
     // add event
-    var added = {d:2}
-    obj.a.$add('c', added)
-    expect(spy).toHaveBeenCalledWith('a.c', added, u)
+    var add = {d:2}
+    obj.a.$add('c', add)
+    expect(spy).toHaveBeenCalledWith('a.c', add, u)
 
-    // check if added object is properly observed
+    // check if add object is properly observed
     ob.on('set', spy)
     obj.a.c.d = 3
     expect(spy).toHaveBeenCalledWith('a.c.d', 3, u)
@@ -260,7 +260,7 @@ describe('Observer', function () {
   it('object.$delete', function () {
     var obj = {a:{b:1}}
     var ob = Observer.create(obj)
-    ob.on('deleted', spy)
+    ob.on('delete', spy)
 
     obj.a.$delete('b')
     expect(spy).toHaveBeenCalledWith('a.b', u, u)