Inicio Explorar Ayuda
Registro Iniciar sesión
vuejs
/
vue
espejo de https://github.com/vuejs/vue.git
2
0
Fork 0
Archivos Incidencias 0 Wiki
Explorar el Código

get ready for tests

Evan You hace 12 años
padre
8eb3c17214
commit
c6903e0074
Se han modificado 19 ficheros con 114 adiciones y 74 borrados
Dividir vista Mostrar estadísticas de diff
  1. 20 3
      Gruntfile.js
  2. 2 1
      component.json
  3. 4 4
      examples/repeated-items.html
  4. 13 13
      src/compiler.js
  5. 1 2
      src/deps-parser.js
  6. 17 18
      src/directive.js
  7. 1 1
      src/directives/each.js
  8. 7 0
      src/emitter.js
  9. 1 1
      src/observer.js
  10. 28 0
      test/e2e/basic.html
  11. 0 24
      test/test.html
  12. 0 7
      test/test.js
  13. 7 0
      test/unit/binding.js
  14. 13 0
      test/unit/deps-parser.js
  15. 0 0
      test/unit/directive.js
  16. 0 0
      test/unit/exp-parser.js
  17. 0 0
      test/unit/filters.js
  18. 0 0
      test/unit/observer.js
  19. 0 0
      test/unit/text-parser.js

+ 20 - 3
Gruntfile.js
Ver fichero 

@@ -33,7 +33,7 @@ module.exports = function( grunt ) {
 
 
         mocha: {
 
             build: {
 
-                src: ['test/test.html'],
 
+                src: ['test/e2e/*.html'],
 
                 options: {
 
                     reporter: 'Spec',
 
                     run: true
 
@@ -70,14 +70,31 @@ module.exports = function( grunt ) {
 
     grunt.loadNpmTasks( 'grunt-contrib-uglify' )
 
     grunt.loadNpmTasks( 'grunt-component-build' )
 
     grunt.loadNpmTasks( 'grunt-mocha' )
 
-    grunt.registerTask( 'test', ['mocha'] )
 
+    grunt.registerTask( 'test', ['unit', 'mocha'] )
 
     grunt.registerTask( 'default', [
 
         'jshint',
 
         'component_build:build',
 
-        //'test',
 
+        'test',
 
         'uglify'
 
     ])
 
 
+    grunt.registerTask( 'unit', function () {
 
+        var done = this.async(),
 
+            path = 'test/unit',
 
+            Mocha = require('./node_modules/grunt-mocha/node_modules/mocha'),
 
+            mocha_instance = new Mocha({
 
+                ui: 'bdd',
 
+                reporter: 'spec'
 
+            })
 
+        fs.readdirSync(path).forEach(function (file) {
 
+            mocha_instance.addFile(path + '/' + file)
 
+        })
 
+        mocha_instance.run(function (errCount) {
 
+            var withoutErrors = (errCount === 0)
 
+            done(withoutErrors)
 
+        })
 
+    })
 
+
 
     grunt.registerTask( 'version', function (version) {
 
         ;['package', 'bower', 'component'].forEach(function (file) {
 
             file = './' + file + '.json'

+ 2 - 1
component.json
Ver fichero 

@@ -7,13 +7,14 @@
 
     "license": "MIT",
 
     "scripts": [
 
         "src/main.js",
 
+        "src/emitter.js",
 
         "src/config.js",
 
         "src/utils.js",
 
         "src/compiler.js",
 
         "src/viewmodel.js",
 
         "src/binding.js",
 
         "src/observer.js",
 
-        "src/directive-parser.js",
 
+        "src/directive.js",
 
         "src/exp-parser.js",
 
         "src/text-parser.js",
 
         "src/deps-parser.js",

+ 4 - 4
examples/repeated-items.html
Ver fichero 

@@ -6,10 +6,6 @@
 
     </head>
 
     <body>
 
         <div id="app">
 
-            <ul>
 
-                <li sd-each="item:items" sd-text="item.title"></li>
 
-            </ul>
 
-            <p>Total items: {{items.length}}</p>
 
             <p>
 
                 <button sd-on="click:push">push</button>
 
                 <button sd-on="click:pop">pop</button>
 
@@ -21,6 +17,10 @@
 
                 <button sd-on="click:sort">sort</button>
 
                 <button sd-on="click:reverse">reverse</button>
 
             </p>
 
+            <p>Total items: {{items.length}}</p>
 
+            <ul>
 
+                <li sd-each="item:items" sd-text="item.title"></li>
 
+            </ul>
 
         </div>
 
         <script src="../dist/seed.js"></script>
 
         <script>

+ 13 - 13
src/compiler.js
Ver fichero 

@@ -1,13 +1,13 @@
 
-var Emitter         = require('emitter'),
 
-    Observer        = require('./observer'),
 
-    config          = require('./config'),
 
-    utils           = require('./utils'),
 
-    Binding         = require('./binding'),
 
-    DirectiveParser = require('./directive-parser'),
 
-    TextParser      = require('./text-parser'),
 
-    DepsParser      = require('./deps-parser'),
 
-    ExpParser       = require('./exp-parser'),
 
-    slice           = Array.prototype.slice,
 
+var Emitter     = require('./emitter'),
 
+    Observer    = require('./observer'),
 
+    config      = require('./config'),
 
+    utils       = require('./utils'),
 
+    Binding     = require('./binding'),
 
+    Directive   = require('./directive'),
 
+    TextParser  = require('./text-parser'),
 
+    DepsParser  = require('./deps-parser'),
 
+    ExpParser   = require('./exp-parser'),
 
+    slice       = Array.prototype.slice,
 
     vmAttr,
 
     eachAttr
 
 
@@ -168,7 +168,7 @@ CompilerProto.compileNode = function (node, root) {
 
 
         if (eachExp) { // each block
 
 
-            directive = DirectiveParser.parse(eachAttr, eachExp)
 
+            directive = Directive.parse(eachAttr, eachExp)
 
             if (directive) {
 
                 directive.el = node
 
                 compiler.bindDirective(directive)
 
@@ -201,7 +201,7 @@ CompilerProto.compileNode = function (node, root) {
 
                     j = exps.length
 
                     while (j--) {
 
                         exp = exps[j]
 
-                        directive = DirectiveParser.parse(attr.name, exp)
 
+                        directive = Directive.parse(attr.name, exp)
 
                         if (directive) {
 
                             valid = true
 
                             directive.el = node
 
@@ -236,7 +236,7 @@ CompilerProto.compileTextNode = function (node) {
 
         token = tokens[i]
 
         el = document.createTextNode('')
 
         if (token.key) {
 
-            directive = DirectiveParser.parse(dirname, token.key)
 
+            directive = Directive.parse(dirname, token.key)
 
             if (directive) {
 
                 directive.el = el
 
                 compiler.bindDirective(directive)

+ 1 - 2
src/deps-parser.js
Ver fichero 

@@ -1,5 +1,4 @@
 
-var Emitter  = require('emitter'),
 
-    //config   = require('./config'),
 
+var Emitter  = require('./emitter'),
 
     utils    = require('./utils'),
 
     observer = new Emitter()

+ 17 - 18
src/directive-parser.js → src/directive.js
Ver fichero 

@@ -160,26 +160,25 @@ DirProto.unbind = function (update) {
 
     if (!update) this.vm = this.el = this.binding = this.compiler = null
 
 }
 
 
-module.exports = {
 
+/*
 
+ *  make sure the directive and expression is valid
 
+ *  before we create an instance
 
+ */
 
+Directive.parse = function (dirname, expression) {
 
 
-    /*
 
-     *  make sure the directive and expression is valid
 
-     *  before we create an instance
 
-     */
 
-    parse: function (dirname, expression) {
 
+    var prefix = config.prefix
 
+    if (dirname.indexOf(prefix) === -1) return null
 
+    dirname = dirname.slice(prefix.length + 1)
 
 
-        var prefix = config.prefix
 
-        if (dirname.indexOf(prefix) === -1) return null
 
-        dirname = dirname.slice(prefix.length + 1)
 
+    var dir   = directives[dirname],
 
+        valid = KEY_RE.test(expression)
 
 
-        var dir   = directives[dirname],
 
-            valid = KEY_RE.test(expression)
 
+    if (!dir) utils.warn('unknown directive: ' + dirname)
 
+    if (!valid) utils.warn('invalid directive expression: ' + expression)
 
 
-        if (!dir) utils.warn('unknown directive: ' + dirname)
 
-        if (!valid) utils.warn('invalid directive expression: ' + expression)
 
+    return dir && valid
 
+        ? new Directive(dirname, expression)
 
+        : null
 
+}
 
 
-        return dir && valid
 
-            ? new Directive(dirname, expression)
 
-            : null
 
-    }
 
-}
 
+module.exports = Directive

+ 1 - 1
src/directives/each.js
Ver fichero 

@@ -1,7 +1,7 @@
 
 var config   = require('../config'),
 
     utils    = require('../utils'),
 
     Observer = require('../observer'),
 
-    Emitter  = require('emitter'),
 
+    Emitter  = require('../emitter'),
 
     ViewModel // lazy def to avoid circular dependency
 
 
 /*

+ 7 - 0
src/emitter.js
Ver fichero 

@@ -0,0 +1,7 @@
 
+// shiv to make this work for component, browserify
 
+// and node at the same time
 
+var Emitter
 
+try {
 
+    Emitter = require('emitter')
 
+} catch (e) {}
 
+module.exports = Emitter || require('events').EventEmitter

+ 1 - 1
src/observer.js
Ver fichero 

@@ -1,4 +1,4 @@
 
-var Emitter = require('emitter'),
 
+var Emitter = require('./emitter'),
 
     utils   = require('./utils'),
 
     typeOf  = utils.typeOf,
 
     def     = Object.defineProperty,

+ 28 - 0
test/e2e/basic.html
Ver fichero 

@@ -0,0 +1,28 @@
 
+<!DOCTYPE html>
 
+<html>
 
+	<head>
 
+		<title>Test</title>
 
+		<meta charset="utf-8">
 
+		<link rel="stylesheet" type="text/css" href="../../node_modules/grunt-mocha/node_modules/mocha/mocha.css">
 
+	</head>
 
+	<body>
 
+		<div id="mocha"></div>
 
+		<script src="../../node_modules/grunt-mocha/node_modules/mocha/mocha.js"></script>
 
+		<script src="../../node_modules/chai/chai.js"></script>
 
+		<script src="../../dist/seed.js"></script>
 
+		<script>
 
+			mocha.setup('bdd')
 
+			var assert = chai.assert
 
+
 
+			describe('E2E: Basic', function () {
 
+			    it('should have a bootstrap method', function () {
 
+			        assert.ok(seed.bootstrap)
 
+			    })
 
+			})
 
+
 
+			if (navigator.userAgent.indexOf('PhantomJS') < 0) {
 
+            	mocha.run();
 
+        	}
 
+		</script>
 
+	</body>
 
+</html>

+ 0 - 24
test/test.html
Ver fichero 

@@ -1,24 +0,0 @@
 
-<!DOCTYPE html>
 
-<html>
 
-	<head>
 
-		<title>Test</title>
 
-		<meta charset="utf-8">
 
-		<link rel="stylesheet" type="text/css" href="../node_modules/grunt-mocha/node_modules/mocha/mocha.css">
 
-	</head>
 
-	<body>
 
-		<div id="mocha"></div>
 
-		<script src="../node_modules/grunt-mocha/node_modules/mocha/mocha.js"></script>
 
-		<script src="../node_modules/chai/chai.js"></script>
 
-		<script>
 
-			mocha.setup('bdd')
 
-			var assert = chai.assert
 
-		</script>
 
-		<script src="../dist/seed.js"></script>
 
-		<script src="test.js"></script>
 
-		<script>
 
-			if (navigator.userAgent.indexOf('PhantomJS') < 0) {
 
-            	mocha.run();
 
-        	}
 
-		</script>
 
-	</body>
 
-</html>

+ 0 - 7
test/test.js
Ver fichero 

@@ -1,7 +0,0 @@
 
-var Seed = require('seed')
 
-
 
-describe('Seed', function () {
 
-    it('should have a bootstrap method', function () {
 
-        assert.ok(Seed.bootstrap)
 
-    })
 
-})

+ 7 - 0
test/unit/binding.js
Ver fichero 

@@ -0,0 +1,7 @@
 
+var assert = require('assert')
 
+
 
+describe('UNIT: Binding', function () {
 
+    it('should work', function () {
 
+        assert.ok(true)
 
+    })
 
+})

+ 13 - 0
test/unit/deps-parser.js
Ver fichero 

@@ -0,0 +1,13 @@
 
+// shiv the document to provide dummy object
 
+global.document = {
 
+    createElement: function () { return {} }
 
+}
 
+
 
+var DepsParser = require('../../src/deps-parser'),
 
+    assert     = require('assert')
 
+
 
+describe('UNIT: Dependency Parser', function () {
 
+    it('should work', function () {
 
+        assert.ok(true)
 
+    })
 
+})

+ 0 - 0
test/unit/directive.js
Ver fichero


+ 0 - 0
test/unit/exp-parser.js
Ver fichero


+ 0 - 0
test/unit/filters.js
Ver fichero


+ 0 - 0
test/unit/observer.js
Ver fichero


+ 0 - 0
test/unit/text-parser.js
Ver fichero