nuysoft · fr0m · Dec 4, 2017 · Dec 4, 2017 · Dec 4, 2017 · Dec 4, 2017
diff --git a/.travis.yml b/.travis.yml
@@ -8,6 +8,7 @@ before_script:
   - bower install
   - cd test
   - bower install
+  - npm install
   - cd ..
 after_script:
   - npm run coveralls
diff --git a/src/mock/random/date.js b/src/mock/random/date.js
@@ -113,6 +113,7 @@ module.exports = {
         format = format || 'yyyy-MM-dd HH:mm:ss'
 
         var date = new Date()
+        var extraDay = 0
 
         /* jshint -W086 */
         // 参考自 http://momentjs.cn/docs/#/manipulating/start-of/
@@ -121,6 +122,7 @@ module.exports = {
                 date.setMonth(0)
             case 'month':
                 date.setDate(1)
+            case 'weekiso':
             case 'week':
             case 'day':
                 date.setHours(0)
@@ -132,8 +134,10 @@ module.exports = {
                 date.setMilliseconds(0)
         }
         switch (unit) {
+            case 'weekiso':
+                extraDay++
             case 'week':
-                date.setDate(date.getDate() - date.getDay())
+                date.setDate(date.getDate() - date.getDay() + extraDay)
         }
 
         return this._formatDate(date, format)

diff --git a/test/package.json b/test/package.json
@@ -1,6 +1,6 @@
 {
   "name": "test",
   "dependencies": {
-    "chai": "^1.10.0"
+    "mocha": "^4.0.1"
   }
 }
diff --git a/test/test.mock.html b/test/test.mock.html
@@ -4,7 +4,7 @@
     <title>Test: Mock</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <link href="./bower_components/mocha/mocha.css" rel="stylesheet">
+    <link href="./node_modules/mocha/mocha.css" rel="stylesheet">
     <style type="text/css">
         li.test h2 {
             font-family: monospace;
@@ -16,13 +16,13 @@
 <body>
     <div id="mocha"></div>
     <!-- Include local Mocha. -->
-    <script src="./bower_components/mocha/mocha.js"></script>
+    <script src="./node_modules/mocha/mocha.js"></script>
     <script src="./bower_components/chai/chai.js"></script>
     <script>mocha.setup('bdd')</script>
     <!-- Include RequireJS -->
     <script src="./bower_components/requirejs/require.js"></script>
     <script type="text/javascript">
-        require.config({
+        requirejs.config({
             paths: {
                 'mock': '../dist/mock',
                 jquery: 'bower_components/jquery/dist/jquery',
@@ -44,7 +44,7 @@
     <script src="./test.mock.request.js"></script>
     <script src="./test.mock.schema.js"></script>
     <script src="./test.mock.valid.js"></script>
-    
+
     <!-- PhantomJS -->
     <script type="text/javascript">
          if (window.mochaPhantomJS) {
@@ -54,4 +54,4 @@
          }
     </script>
 </body>
-</html>
+</html>
diff --git a/test/test.mock.mock.js b/test/test.mock.mock.js
@@ -5,7 +5,7 @@ var Mock, $, _
 
 describe('Mock.mock', function() {
     before(function(done) {
-        require(['mock', 'underscore', 'jquery'], function() {
+        requirejs(['mock', 'underscore', 'jquery'], function() {
             Mock = arguments[0]
             _ = arguments[1]
             $ = arguments[2]
@@ -59,4 +59,4 @@ describe('Mock.mock', function() {
             })
         })
     })
-})
+})
diff --git a/test/test.mock.random.js b/test/test.mock.random.js
@@ -7,7 +7,7 @@ var Mock, Random, $, _, Random
 /* jshint -W061 */
 describe('Random', function() {
     before(function(done) {
-        require(['mock', 'underscore', 'jquery'], function() {
+        requirejs(['mock', 'underscore', 'jquery'], function() {
             Mock = arguments[0]
             window.Random = Random = Mock.Random
             _ = arguments[1]
@@ -212,6 +212,9 @@ describe('Random', function() {
         doit('Random.now("week")', function(data) {
             expect(data).to.be.ok
         })
+        doit('Random.now("weekiso")', function(data) {
+            expect(data).to.be.ok
+        })
         doit('Random.now("yyyy-MM-dd HH:mm:ss SS")', function(data) {
             expect(data).to.be.ok
         })
@@ -461,4 +464,4 @@ describe('Random', function() {
             expect(data).to.be.a('string').with.length(18)
         })
     })
-})
+})
diff --git a/test/test.mock.request.js b/test/test.mock.request.js
@@ -5,7 +5,7 @@ var Mock, $, _
 
 describe('Request', function() {
     before(function(done) {
-        require(['mock', 'underscore', 'jquery'], function() {
+        requirejs(['mock', 'underscore', 'jquery'], function() {
             Mock = arguments[0]
             _ = arguments[1]
             $ = arguments[2]
@@ -442,4 +442,4 @@ describe('Request', function() {
             done()
         })
     })
-})
+})
diff --git a/test/test.mock.schema.js b/test/test.mock.schema.js
@@ -6,7 +6,7 @@ var Mock, $, _
 
 describe('Schema', function() {
     before(function(done) {
-        require(['mock', 'underscore', 'jquery'], function() {
+        requirejs(['mock', 'underscore', 'jquery'], function() {
             Mock = arguments[0]
             window.XMLHttpRequest = Mock.XHR
             _ = arguments[1]
@@ -202,4 +202,4 @@ describe('Schema', function() {
         })
     })
 
-})
+})
diff --git a/test/test.mock.spec.dpd.js b/test/test.mock.spec.dpd.js
@@ -5,7 +5,7 @@ var Mock, $, _
 
 describe('DPD', function() {
     before(function(done) {
-        require(['mock', 'underscore', 'jquery'], function() {
+        requirejs(['mock', 'underscore', 'jquery'], function() {
             Mock = arguments[0]
             _ = arguments[1]
             $ = arguments[2]
@@ -235,4 +235,4 @@ describe('DPD', function() {
             expect(data).to.be.a('object')
         })
     })
-})
+})
diff --git a/test/test.mock.spec.dtd.js b/test/test.mock.spec.dtd.js
@@ -2,7 +2,7 @@
 // 数据模板定义（Data Temaplte Definition，DTD）
 /*
     ## BDD
-    1. 结构 
+    1. 结构
         describe suite
             [ describe ]
             before after beforeEach afterEach
@@ -18,7 +18,7 @@
             .to.be.a .to.be.an
             .that
             .least .most .within
-    3. 速度 
+    3. 速度
         搜索 test.speed
         slow > 75
         75 / 2 < medium < 75
@@ -29,7 +29,7 @@ var Mock, $, _
 
 describe('DTD', function() {
     before(function(done) {
-        require(['mock', 'underscore', 'jquery'], function() {
+        requirejs(['mock', 'underscore', 'jquery'], function() {
             Mock = arguments[0]
             _ = arguments[1]
             $ = arguments[2]
@@ -48,28 +48,28 @@ describe('DTD', function() {
             var data = Mock.mock(this.test.title)
             expect(data).to.equal(this.test.title)
         })
-        it(1, function() {
-            var data = Mock.mock(this.test.title)
-            expect(data).to.equal(this.test.title)
+        it('number', function() {
+            var data = Mock.mock(1)
+            expect(data).to.equal(1)
         })
-        it(true, function() {
-            var data = Mock.mock(this.test.title)
-            expect(data).to.equal(this.test.title)
+        it('true', function() {
+            var data = Mock.mock(true)
+            expect(data).to.equal(true)
         })
-        it(false, function() {
-            var data = Mock.mock(this.test.title)
-            expect(data).to.equal(this.test.title)
+        it('false', function() {
+            var data = Mock.mock(false)
+            expect(data).to.equal(false)
         })
-        it({}, function() {
-            var data = Mock.mock(this.test.title)
-            expect(data).to.deep.equal(this.test.title)
+        it('object', function() {
+            var data = Mock.mock({})
+            expect(data).to.deep.equal({})
         })
-        it([], function() {
-            var data = Mock.mock(this.test.title)
-            expect(data).to.deep.equal(this.test.title)
+        it('array', function() {
+            var data = Mock.mock([])
+            expect(data).to.deep.equal([])
         })
-        it(function() {}, function() {
-            var data = Mock.mock(this.test.title)
+        it('function', function() {
+            var data = Mock.mock(function() {})
             expect(data).to.equal(undefined)
         })
     })
@@ -205,7 +205,7 @@ describe('DTD', function() {
         })
     })
     describe('Boolean', function() {
-        // `'name|1': value` 
+        // `'name|1': value`
         it('name|1', function() {
             var data = Mock.mock({
                 'name|1': true
@@ -500,7 +500,7 @@ describe('DTD', function() {
                 }
             }
 
-            it(regexp, function() {
+            it(regexp.toString(), function() {
                 var data = Mock.mock(regexp)
                 this.test.title += ' => ' + data
                 expect(regexp.test(data)).to.be.true
@@ -674,4 +674,4 @@ describe('DTD', function() {
             expect(data).to.be.a('object')
         })
     })
-})
+})
diff --git a/test/test.mock.valid.js b/test/test.mock.valid.js
@@ -5,7 +5,7 @@ var Mock, Random, $, _
 
 describe('Mock.valid', function() {
     before(function(done) {
-        require(['mock', 'underscore', 'jquery'], function() {
+        requirejs(['mock', 'underscore', 'jquery'], function() {
             Mock = arguments[0]
             window.Random = Random = Mock.Random
             _ = arguments[1]
@@ -305,4 +305,4 @@ describe('Mock.valid', function() {
             name: 123
         }, 0)
     })
-})
+})