diff --git a/_develop/karma.config.js b/_develop/karma.config.js index 3b6294c202..8cd2fa01a1 100644 --- a/_develop/karma.config.js +++ b/_develop/karma.config.js @@ -11,8 +11,13 @@ module.exports = function(config) { files: [ 'dist/quill.css', - 'dist/unit.js' + 'dist/unit.js', + { pattern: 'dist/*.map', included: false, served: true }, + { pattern: 'assets/favicon.png', included: false, served: true } ], + proxies: { + '/assets/': '/karma/base/assets/' + }, frameworks: ['jasmine'], reporters: ['progress'], diff --git a/_develop/proxy.js b/_develop/proxy.js index 196e686f4a..cdf9f2c4cc 100644 --- a/_develop/proxy.js +++ b/_develop/proxy.js @@ -1,20 +1,15 @@ var http = require('http'); var httpProxy = require('http-proxy'); -var FAVICON = new Buffer('iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAACf0lEQVR42r2XS2gTURSG04K2VReilorEECVKiJk8EYuurIgPEFddKW4El1J3FbRUEOzKKuhKdy4Uql0H0UVxoYIKkoWCrxaKz1qKTayNYv0O3IEhzNzecSYz8HNnJpPz3XPm3HPuxGIRHNlstqdQKBwul8tDpVLpDprg/BV63hJgPB7vAngU0HX0BtCSh76FCs7n89sBjqJZDfS343whFHCxWNyEsZvojwb8jok9YKw77tUDwzF6CtW8wPw2zwQvMN51+f3jf4MzmcwaDIxpPBb4S8Zd6JHHM9UgIa/q4OgqObFDQq+Z4G3fcLJ77TLwBSZ4gueSACaXmeRZv2FfidGHGo9+MO7N5XJbDOBLRKjoN+Eu69Y0Xu80haO3mGzzAz+I/np4Pk3YMwLnesoALv8ZMIYnk8lOTTLNCNyyrK2mcPQerTKeAA8PenhRQ70+4T95Vbv9rvcZF0MNPD/EmNDBmeB3qYDSF7geAb7fb+KdcTMM/CTjBtXVnMAv6BY6ThfcHLjUYvS1i1ejKjJPm+7PomP8rT2UJiPvygVekXbL+X3Ne37BcwfCaDRXmuCT6XR6vWwqDJdaRVZQkAl8cPZxIrKHe9cM4Z9RX5DwF5qMnlcygY+TpN1Bwz/sMPpEst6rEjqTUBpRKAmIscfK6C/G07LuNfCG5AsrY10ocGr6ahsoPZtxzsPjRcYbUglD3VwSxn12b0efXMBfVWdMtGRbLXs4j7o/Ltttrle07CNCdT57xyNldkSWUyqV6ojiI6YN2D17wyi5EIvyIPTnFHyOUG+LFA60X9a50pGo4ZZ8QCjvL0Ud9m675kvzCK2V+qh4F9Ez+Xqhkm2MRXz8AzAAXszjgRshAAAAAElFTkSuQmCC', 'base64'); - var proxy = httpProxy.createProxyServer({}); var server = http.createServer(function(req, res) { - if (req.url === '/favicon.png') { - res.setHeader('Content-Type', 'image/png'); - res.end(FAVICON); - } else if (/\/\d+\.\d+\.\d+/.test(req.url) || req.url.startsWith('/karma/base/dist')) { + if (/\/\d+\.\d+\.\d+/.test(req.url) || req.url.startsWith('/karma/base/dist')) { proxy.web(req, res, { ignorePath: true, target: 'http://localhost:9080/' + req.url.split('/').pop() }); - } else if (req.url.startsWith('/karma')) { + } else if (req.url.startsWith('/karma') || req.url === '/assets/favicon.png') { proxy.web(req, res, { ignorePath: false, target: { port: 9876 } }); } else { proxy.web(req, res, { ignorePath: false, target: { port: 4000 } }); diff --git a/assets/favicon.png b/assets/favicon.png new file mode 100644 index 0000000000..f0f8cdbd63 Binary files /dev/null and b/assets/favicon.png differ diff --git a/package.json b/package.json index 04dd292d44..eb16d989b6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "quill", - "version": "0.20.0", + "version": "1.0.0", "dependencies": { "clone": "~1.0.2", "deep-equal": "~1.0.1", @@ -32,7 +32,7 @@ "build": "webpack --config _develop/webpack.config.js", "start": "foreman start -f _develop/procfile", "test": "karma start _develop/karma.config.js --single-run --browsers Chrome", - "travis": "karma start _develop/karma.config.js --single-run" + "travis": "karma start _develop/karma.config.js --single-run --reporters dots,saucelabs" }, "private": true } diff --git a/test/unit/editor.js b/test/unit/editor.js index 93108d6420..352a7fa00f 100644 --- a/test/unit/editor.js +++ b/test/unit/editor.js @@ -81,14 +81,14 @@ describe('Editor', function() { it('embed', function() { let editor = this.initialize(Editor, '

0123

'); - editor.insertEmbed(2, 'image', '/favicon.png'); + editor.insertEmbed(2, 'image', '/assets/favicon.png'); expect(editor.getDelta()).toEqual(new Delta() .insert('01', { bold: true }) - .insert({ image: '/favicon.png'}, { bold: true }) + .insert({ image: '/assets/favicon.png'}, { bold: true }) .insert('23', { bold: true }) .insert('\n') ); - expect(this.container.innerHTML).toEqualHTML('

0123

'); + expect(this.container.innerHTML).toEqualHTML('

0123

'); }); it('on empty line', function() { diff --git a/test/unit/selection.js b/test/unit/selection.js index 03c956b1a1..828a6fc04f 100644 --- a/test/unit/selection.js +++ b/test/unit/selection.js @@ -90,13 +90,13 @@ describe('Selection', function() { it('between embed', function() { let selection = this.initialize(Selection, `

- - + +

` ); @@ -197,13 +197,13 @@ describe('Selection', function() { it('between embeds', function() { let selection = this.initialize(Selection, `

- - + +

` ); @@ -316,8 +316,8 @@ describe('Selection', function() { it('image', function() { let selection = this.initialize(Selection, `

- - + +

` , this.div); this.bounds = selection.getBounds(1);