@matrixreq/htmldiff 1.6.0 → 2.0.1

package/test/calculate_operations.spec.js

@@ -1,278 +0,0 @@
-// Calculates the differences into a list of edit operations.
-describe('calculateOperations', function(){
-    var cut, res, tokenize;
-
-    beforeEach(function(){
-        cut = require('../js/htmldiff').calculateOperations;
-        tokenize = require('../js/htmldiff').htmlToTokens;
-    });
-
-    it('should be a function', function(){
-        expect(cut).is.a('function');
-    });
-
-    describe('Actions', function(){
-        describe('In the middle', function(){
-            describe('Replace', function(){
-                beforeEach(function(){
-                    var before = tokenize('working on it');
-                    var after = tokenize('working in it');
-                    res = cut(before, after);
-                });
-
-                it('should result in 3 operations', function(){
-                    expect(res.length).to.equal(3);
-                });
-
-                it('should replace "on"', function(){
-                    expect(res[1]).eql({
-                        action          : 'replace',
-                        startInBefore   : 2,
-                        endInBefore     : 2,
-                        startInAfter    : 2,
-                        endInAfter      : 2
-                    });
-                });
-            });
-
-            describe('Insert', function(){
-                beforeEach(function(){
-                    var before = tokenize('working it');
-                    var after = tokenize('working in it');
-                    res = cut(before, after);
-                });
-
-                it('should result in 3 operations', function(){
-                    expect(res.length).to.equal(3);
-                });
-
-                it('should show an insert for "on"', function(){
-                    expect(res[1]).eql({
-                        action          : 'insert',
-                        startInBefore   : 2,
-                        endInBefore     : null,
-                        startInAfter    : 2,
-                        endInAfter      : 3
-                    });
-                });
-
-                describe('More than one word', function(){
-                    beforeEach(function(){
-                        var before = tokenize('working it');
-                        var after =  tokenize('working all up on it');
-                        res = cut(before, after);
-                    });
-
-                    it('should still have 3 operations', function(){
-                        expect(res.length).to.equal(3);
-                    });
-
-                    it('should show a big insert', function(){
-                        expect(res[1]).eql({
-                            action          : 'insert',
-                            startInBefore   : 2,
-                            endInBefore     : null,
-                            startInAfter    : 2,
-                            endInAfter      : 7
-                        });
-                    });
-                });
-            });
-
-            describe('Delete', function(){
-                beforeEach(function(){
-                    var before = tokenize('this is a lot of text');
-                    var after = tokenize('this is text');
-                    res = cut(before, after);
-                });
-
-                it('should return 3 operations', function(){
-                    expect(res.length).to.equal(3);
-                });
-
-                it('should show the delete in the middle', function(){
-                    expect(res[1]).eql({
-                        action          : 'delete',
-                        startInBefore   : 4,
-                        endInBefore     : 9,
-                        startInAfter    : 4,
-                        endInAfter      : null
-                    });
-                });
-            });
-
-            describe('Equal', function(){
-                beforeEach(function(){
-                    var before = tokenize('this is what it sounds like');
-                    var after = tokenize('this is what it sounds like');
-                    res = cut(before, after);
-                });
-
-                it('should return a single op', function(){
-                    expect(res.length).to.equal(1);
-                    expect(res[0]).eql({
-                        action          : 'equal',
-                        startInBefore   : 0,
-                        endInBefore     : 10,
-                        startInAfter    : 0,
-                        endInAfter      : 10
-                    });
-                });
-            });
-        });
-
-        describe('At the beginning', function(){
-            describe('Replace', function(){
-                beforeEach(function(){
-                    var before = tokenize('I dont like veggies');
-                    var after = tokenize('Joe loves veggies');
-                    res = cut(before, after);
-                });
-
-                it('should return 2 operations', function(){
-                    expect(res.length).to.equal(2);
-                });
-
-                it('should have a replace at the beginning', function(){
-                    expect(res[0]).eql({
-                        action          : 'replace',
-                        startInBefore   : 0,
-                        endInBefore     : 4,
-                        startInAfter    : 0,
-                        endInAfter      : 2
-                    });
-                });
-            });
-
-            describe('Insert', function(){
-                beforeEach(function(){
-                    var before = tokenize('dog');
-                    var after = tokenize('the shaggy dog');
-                    res = cut(before, after);
-                });
-
-                it('should return 2 operations', function(){
-                    expect(res.length).to.equal(2);
-                });
-
-                it('should have an insert at the beginning', function(){
-                    expect(res[0]).eql({
-                        action          : 'insert',
-                        startInBefore   : 0,
-                        endInBefore     : null,
-                        startInAfter    : 0,
-                        endInAfter      : 3
-                    });
-                });
-            });
-
-            describe('Delete', function(){
-                beforeEach(function(){
-                    var before = tokenize('awesome dog barks');
-                    var after = tokenize('dog barks');
-                    res = cut(before, after);
-                });
-
-                it('should return 2 operations', function(){
-                    expect(res.length).to.equal(2);
-                });
-
-                it('should have a delete at the beginning', function(){
-                    expect(res[0]).eql({
-                        action          : 'delete',
-                        startInBefore   : 0,
-                        endInBefore     : 1,
-                        startInAfter    : 0,
-                        endInAfter      : null
-                    });
-                });
-            });
-        });
-
-        describe('At the end', function(){
-            describe('Replace', function(){
-                beforeEach(function(){
-                    var before = tokenize('the dog bit the cat');
-                    var after = tokenize('the dog bit a bird');
-                    res = cut(before, after);
-                });
-
-                it('should return 2 operations', function(){
-                    expect(res.length).to.equal(2);
-                });
-
-                it('should have a replace at the end', function(){
-                    expect(res[1]).eql({
-                        action          : 'replace',
-                        startInBefore   : 6,
-                        endInBefore     : 8,
-                        startInAfter    : 6,
-                        endInAfter      : 8
-                    });
-                });
-            });
-
-            describe('Insert', function(){
-                beforeEach(function(){
-                    var before = tokenize('this is a dog');
-                    var after = tokenize('this is a dog that barks');
-                    res = cut(before, after);
-                });
-
-                it('should return 2 operations', function(){
-                    expect(res.length).to.equal(2);
-                });
-
-                it('should have an Insert at the end', function(){
-                    expect(res[1]).eql({
-                        action          : 'insert',
-                        startInBefore   : 7,
-                        endInBefore     : null,
-                        startInAfter    : 7,
-                        endInAfter      : 10
-                    });
-                });
-            });
-
-            describe('Delete', function(){
-                beforeEach(function(){
-                    var before = tokenize('this is a dog that barks');
-                    var after = tokenize('this is a dog');
-                    res = cut(before, after);
-                });
-
-                it('should have 2 operations', function(){
-                    expect(res.length).to.equal(2);
-                });
-
-                it('should have a delete at the end', function(){
-                    expect(res[1]).eql({
-                        action          : 'delete',
-                        startInBefore   : 7,
-                        endInBefore     : 10,
-                        startInAfter    : 7,
-                        endInAfter      : null
-                    });
-                });
-            });
-        });
-    });
-
-    describe('Action Combination', function(){
-        describe('dont absorb non-single-whitespace tokens', function(){
-            beforeEach(function(){
-                var before = tokenize('I  am awesome');
-                var after = tokenize('You  are great');
-                res = cut(before, after);
-            });
-
-            it('should return 3 actions', function(){
-                expect(res.length).to.equal(1);
-            });
-
-            it('should have a replace first', function(){
-                expect(res[0].action).to.equal('replace');
-            });
-        });
-    });
-});

package/test/config.js

@@ -1,2 +0,0 @@
-var chai = require('chai');
-global.expect = chai.expect;

package/test/diff.spec.js

@@ -1,318 +0,0 @@
-describe('Diff', function(){
-    var cut, res, html_to_tokens, calculate_operations;
-  
-    beforeEach(function(){
-      cut = require('../js/htmldiff');
-      html_to_tokens = cut.htmlToTokens;
-      calculate_operations = cut.calculateOperations;
-    });
-  
-    describe('When both inputs are the same', function(){
-      beforeEach(function(){
-        res = cut('input text', 'input text');
-      });
-  
-      it('should return the text', function(){
-        expect(res).equal('input text');
-      });
-    }); // describe('When both inputs are the same')
-  
-    describe('When a letter is added', function(){
-      beforeEach(function(){
-        res = cut('input', 'input 2');
-      });
-  
-      it('should mark the new letter', function(){
-        expect(res).to.equal('input<ins data-operation-index="1"> 2</ins>');
-      });
-    }); // describe('When a letter is added')
-  
-    describe('Whitespace differences', function(){
-      it('should collapse adjacent whitespace', function(){
-        expect(cut('Much \t    spaces', 'Much spaces')).to.equal('Much spaces');
-      });
-
-      it('should consider non-breaking spaces as equal', function(){
-        expect(cut('Hello&nbsp;world', 'Hello&#160;world')).to.equal('Hello&#160;world');
-      });
-  
-      it('should consider non-breaking spaces and non-adjacent regular spaces as equal', function(){
-        expect(cut('Hello&nbsp;world', 'Hello world')).to.equal('Hello world');
-      });
-    }); // describe('Whitespace differences')
-  
-    describe('When a class name is specified', function(){
-      it('should include the class in the wrapper tags', function(){
-        expect(cut('input', 'input 2', 'diff-result')).to.equal(
-          'input<ins data-operation-index="1" class="diff-result"> 2</ins>');
-      });
-    }); // describe('When a class name is specified')
-  
-    describe('Image Differences', function(){
-      it('show two images as different if their src attributes are different', function() {
-        var before = html_to_tokens('<img src="a.jpg">');
-        var after = html_to_tokens('<img src="b.jpg">');
-        var ops = calculate_operations(before, after);
-        expect(ops.length).to.equal(1);
-        expect(ops[0]).to.eql({
-          action: 'replace',
-          startInBefore: 0,
-          endInBefore: 0,
-          startInAfter: 0,
-          endInAfter: 0
-        });
-      });
-  
-      it('should show two images are the same if their src attributes are the same', function() {
-        var before = html_to_tokens('<img src="a.jpg">');
-        var after = html_to_tokens('<img src="a.jpg" alt="hey!">');
-        var ops = calculate_operations(before, after);
-        expect(ops.length).to.equal(1);
-        expect(ops[0]).to.eql({
-          action: 'equal',
-          startInBefore: 0,
-          endInBefore: 0,
-          startInAfter: 0,
-          endInAfter: 0
-        });
-      });
-    }); // describe('Image Differences')
-    
-    describe('Widget Differences', function(){
-      it('show two widgets as different if their data attributes are different', function() {
-        var before = html_to_tokens('<object data="a.jpg"></object>');
-        var after = html_to_tokens('<object data="b.jpg"></object>');
-        var ops = calculate_operations(before, after);
-        expect(ops.length).to.equal(1);
-        expect(ops[0]).to.eql({
-          action: 'replace',
-          startInBefore: 0,
-          endInBefore: 0,
-          startInAfter: 0,
-          endInAfter: 0
-        });
-      });
-  
-      it('should show two widgets are the same if their data attributes are the same', function() {
-        var before = html_to_tokens('<object data="a.jpg"><param>yo!</param></object>');
-        var after = html_to_tokens('<object data="a.jpg"></object>');
-        var ops = calculate_operations(before, after);
-        expect(ops.length).to.equal(1);
-        expect(ops[0]).to.eql({
-          action: 'equal',
-          startInBefore: 0,
-          endInBefore: 0,
-          startInAfter: 0,
-          endInAfter: 0
-        });
-      });
-    }); // describe('Widget Differences')
-  
-      describe('Math Differences', function(){
-      it('should show two math elements as different if their contents are different', function() {
-        var before = html_to_tokens('<math data-uuid="55784cd906504787a8e459e80e3bb554"><msqrt>' +
-          '<msup><mi>b</mi><mn>2</mn></msup></msqrt></math>');
-        var after = html_to_tokens('<math data-uuid="55784cd906504787a8e459e80e3bb554"><msqrt>' +
-          '<msup><mn>b</mn><mn>5</mn></msup></msqrt></math>');
-        var ops = calculate_operations(before, after);
-        expect(ops.length).to.equal(1);
-        expect(ops[0]).to.eql({
-          action: 'replace',
-          startInBefore: 0,
-          endInBefore: 0,
-          startInAfter: 0,
-          endInAfter: 0
-        });
-      });
-  
-      it('should show two math elements as the same if their contents are the same', function() {
-        var before = html_to_tokens('<math data-uuid="15568cd906504876548459e80e356878"><msqrt>' +
-          '<msup><mi>b</mi><mn>2</mn></msup></msqrt></math>');
-        var after = html_to_tokens('<math data-uuid="55784cd906504787a8e459e80e3bb554"><msqrt>' +
-          '<msup><mi>b</mi><mn>2</mn></msup></msqrt></math>');
-        var ops = calculate_operations(before, after);
-        expect(ops.length).to.equal(1);
-        expect(ops[0]).to.eql({
-          action: 'equal',
-          startInBefore: 0,
-          endInBefore: 0,
-          startInAfter: 0,
-          endInAfter: 0
-        });
-      });
-    }); // describe('Math Differences')
-  
-    describe('Video Differences', function(){
-      it('show two widgets as different if their data attributes are different', function() {
-        var before = html_to_tokens('<video data-uuid="0787866ab5494d88b4b1ee423453224b">' +
-          '<source src="inkling-video:///big_buck_bunny/webm_high" type="video/webm" /></video>');
-        var after = html_to_tokens('<video data-uuid="0787866ab5494d88b4b1ee423453224b">' +
-          '<source src="inkling-video:///big_buck_rabbit/mp4" type="video/webm" /></video>');
-        var ops = calculate_operations(before, after);
-        expect(ops.length).to.equal(1);
-        expect(ops[0]).to.eql({
-          action: 'replace',
-          startInBefore: 0,
-          endInBefore: 0,
-          startInAfter: 0,
-          endInAfter: 0
-        });
-  
-      });
-  
-      it('should show two widgets are the same if their data attributes are the same', function() {
-        var before = html_to_tokens('<video data-uuid="65656565655487787484545454548494">' +
-          '<source src="inkling-video:///big_buck_bunny/webm_high" type="video/webm" /></video>');
-        var after = html_to_tokens('<video data-uuid="0787866ab5494d88b4b1ee423453224b">' +
-          '<source src="inkling-video:///big_buck_bunny/webm_high" type="video/webm" /></video>');
-        var ops = calculate_operations(before, after);
-        expect(ops.length).to.equal(1);
-        expect(ops[0]).to.eql({
-          action: 'equal',
-          startInBefore: 0,
-          endInBefore: 0,
-          startInAfter: 0,
-          endInAfter: 0
-        });
-      });
-    }); // describe('Video Differences')
-  
-    describe('iframe Differences', function(){
-      it('show two widgets as different if their data attributes are different', function() {
-        var before = html_to_tokens('<iframe src="a.jpg"></iframe>');
-        var after = html_to_tokens('<iframe src="b.jpg"></iframe>');
-        var ops = calculate_operations(before, after);
-        expect(ops.length).to.equal(1);
-        expect(ops[0]).to.eql({
-          action: 'replace',
-          startInBefore: 0,
-          endInBefore: 0,
-          startInAfter: 0,
-          endInAfter: 0
-        });
-      });
-  
-      it('should show two widgets are the same if their data attributes are the same', function() {
-        var before = html_to_tokens('<iframe src="a.jpg"></iframe>');
-        var after = html_to_tokens('<iframe src="a.jpg" class="foo"></iframe>');
-        var ops = calculate_operations(before, after);
-        expect(ops.length).to.equal(1);
-        expect(ops[0]).to.eql({
-          action: 'equal',
-          startInBefore: 0,
-          endInBefore: 0,
-          startInAfter: 0,
-          endInAfter: 0
-        });
-      });
-    }); // describe('iframe Differences')
-
-    describe('Adjacent atomic tag combining', function(){
-      it('should wrap each inserted atomic tag independently when multiple are inserted', function(){
-        var result = cut('', '<iframe src="a.html"></iframe><iframe src="b.html"></iframe>');
-        expect(result).to.equal(
-          '<ins data-operation-index="0"><iframe src="a.html"></iframe></ins>' +
-          '<ins data-operation-index="0"><iframe src="b.html"></iframe></ins>'
-        );
-      });
-
-      it('should wrap each deleted atomic tag independently when multiple are deleted', function(){
-        var result = cut('<iframe src="a.html"></iframe><iframe src="b.html"></iframe>', '');
-        expect(result).to.equal(
-          '<del data-operation-index="0"><iframe src="a.html"></iframe></del>' +
-          '<del data-operation-index="0"><iframe src="b.html"></iframe></del>'
-        );
-      });
-
-      it('should not merge atomic tag with adjacent text in same ins/del', function(){
-        var result = cut('hello world', 'hello<iframe src="a.html"></iframe>world');
-        expect(result).to.equal('hello<ins data-operation-index="1"><iframe src="a.html"></iframe></ins>world');
-      });
-
-      it('should wrap inserted <b> content inside the tag, not in a standalone ins', function(){
-        var result = cut('', '<b>hello</b>');
-        expect(result).to.equal(
-          '<b data-diff-node="ins" data-operation-index="0"><ins data-operation-index="0">hello</ins></b>'
-        );
-      });
-
-      it('should mark non-atomic container tags with data-diff-node rather than wrapping with ins', function(){
-        var result = cut('', '<li><div>content</div></li>');
-        expect(result).to.equal(
-          '<li data-diff-node="ins" data-operation-index="0">' +
-            '<div data-diff-node="ins" data-operation-index="0">' +
-              '<ins data-operation-index="0">content</ins>' +
-            '</div>' +
-          '</li>'
-        );
-      });
-
-      it('should keep adjacent inserted <b> tags as separate segments', function(){
-        var result = cut('', '<b>hello</b><b>world</b>');
-        expect(result).to.equal(
-          '<b data-diff-node="ins" data-operation-index="0"><ins data-operation-index="0">hello</ins></b>' +
-          '<b data-diff-node="ins" data-operation-index="0"><ins data-operation-index="0">world</ins></b>'
-        );
-      });
-    }); // describe('Adjacent atomic tag combining')
-
-    describe('Atomic tag list override (atomicTags parameter)', function(){
-      // Regression tests for the parameter regexp being built with a literal backspace
-      // ('\b' instead of '\\b'), which made every override match nothing.
-      it('treats a listed tag as atomic', function(){
-        var res = cut('<iframe src="a.html"></iframe>', '<iframe src="b.html"></iframe>',
-          null, null, 'iframe');
-        expect(res).to.equal(
-          '<del data-operation-index="0"><iframe src="a.html"></iframe></del>' +
-          '<ins data-operation-index="0"><iframe src="b.html"></iframe></ins>');
-      });
-
-      it('replaces the default list, so an unlisted default tag loses atomicity', function(){
-        var res = cut('<iframe src="a.html">x</iframe>', '<iframe src="a.html">y</iframe>',
-          null, null, 'p');
-        expect(res).to.equal(
-          '<iframe src="a.html">' +
-          '<del data-operation-index="1">x</del>' +
-          '<ins data-operation-index="1">y</ins></iframe>');
-      });
-
-      it('does not match tags that merely start with a listed name', function(){
-        // 'if' must not make <iframe> atomic: tag names are matched completely.
-        var res = cut('<iframe src="a.html">x</iframe>', '<iframe src="a.html">y</iframe>',
-          null, null, 'if');
-        expect(res).to.equal(
-          '<iframe src="a.html">' +
-          '<del data-operation-index="1">x</del>' +
-          '<ins data-operation-index="1">y</ins></iframe>');
-      });
-    }); // describe('Atomic tag list override (atomicTags parameter)')
-
-    describe('Tags sharing a prefix with atomic tag names', function(){
-      it('should diff <abbr> content although a is an atomic tag', function(){
-        expect(cut('<abbr>old</abbr> t', '<abbr>new</abbr> t')).to.equal(
-          '<abbr><del data-operation-index="1">old</del>' +
-          '<ins data-operation-index="1">new</ins></abbr> t');
-      });
-    }); // describe('Tags sharing a prefix with atomic tag names')
-
-    describe('Quoted attribute values containing ">"', function(){
-      it('should diff the content of a tag with ">" in an attribute value', function(){
-        expect(cut('<p title="a>b">old</p>', '<p title="a>b">new</p>')).to.equal(
-          '<p title="a>b">' +
-          '<del data-operation-index="1">old</del>' +
-          '<ins data-operation-index="1">new</ins></p>');
-      });
-    }); // describe('Quoted attribute values containing ">"')
-
-    describe('Void atomic elements', function(){
-      it('should diff text following a void data-htmldiff-id element', function(){
-        var res = cut('<img data-htmldiff-id="1" src="a.jpg"> old',
-          '<img data-htmldiff-id="1" src="a.jpg"> new');
-        expect(res).to.equal(
-          '<img data-htmldiff-id="1" src="a.jpg"> ' +
-          '<del data-operation-index="1">old</del>' +
-          '<ins data-operation-index="1">new</ins>');
-      });
-    }); // describe('Void atomic elements')
-
-  }); // describe('Diff')

package/test/edge_cases.spec.js

@@ -1,41 +0,0 @@
-const diff = require('../js/htmldiff');
-
-describe('Edge cases', () => {
-    it('removes deleted closing-opening tag pair', () => {
-        const before = `<div><p><img src="img1.jpg" /></p><p><img src="img2.jpg" /></p><p>something</p></div>`;
-        const after = `<div><p><img src="img1.jpg" /><img src="img2.jpg" /></p><p>something</p></div>`;
-        const res = `<div><p><img src="img1.jpg" /><del></del><img src="img2.jpg" /></p><p>something</p></div>`;
-
-        expect(diff(before, after)).to.eql(res);
-    });
-
-    it('preserves new lines', () => {
-        const before = `<div>this isain text control Donec ullamcorper tortor quis augue egestas ultricies. Aenean vehicula molestie ex. Praesent id dolor at mauris efficitur ultrices. Vestibulum rutrum sit amet odio quis gravida. Praesent id augue maximus, faucibus tellus in, mattis augue. Pellentesque ullamcorper, ante et vestibulum tempus, libero nisl consequat massa, vel aliquam massa nibh in sapie</div>`;
-        const after = `<div>this isain text control Donec ullamcorper tortor quis augue egestas ultricies. Aenean vehicula molestie ex. Praesent id do at mauris efficitur ultrices. Vestibulum rutrum sit amet odio quis gravida. Praesent id augue maximus, faucibus tellus in, mattisugue. Pellentesque ullamcorper, ante et  tempus, libero nisl consequat massa, vel aliquam massa nibh 
-
-jndfoewnf[owe 1123123242
-%^&amp;*()(*&amp;^%$#@#$%^&amp;*()
-
-BNXOISAN'FOSER3154
-65+
-5SSDC</div>`;
-        const res = `<div>this isain text control Donec ullamcorper tortor quis augue egestas ultricies. Aenean vehicula molestie ex. Praesent id <del data-operation-index="1">dolor</del><ins data-operation-index="1">do</ins> at mauris efficitur ultrices. Vestibulum rutrum sit amet odio quis gravida. Praesent id augue maximus, faucibus tellus in, <del data-operation-index="3">mattis augue.</del><ins data-operation-index="3">mattisugue.</ins> Pellentesque ullamcorper, ante et<del data-operation-index="5"> vestibulum</del>  tempus, libero nisl consequat massa, vel aliquam massa nibh<del data-operation-index="7"> in sapie</del><ins data-operation-index="7"> 
-
-jndfoewnf[owe 1123123242
-%^&amp;*()(*&amp;^%$#@#$%^&amp;*()
-
-BNXOISAN'FOSER3154
-65+
-5SSDC</ins></div>`;
-
-        expect(diff(before, after)).to.eql(res);
-    });
-
-    it('adds data-inserted="true" to inserted tags', () => {
-        const before = `<div>some content</div>`;
-        const after = `<div><strong>some content</strong></div>`;
-        const res = `<div><strong data-inserted="true">some content</strong></div>`;
-
-        expect(diff(before, after)).to.eql(res);
-    });
-});