Skip to content

Cleanup tests #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 27, 2016
Merged

Cleanup tests #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17f6f12
Cleanup tests for html, css handlers and byType generator
s0ph1e Apr 26, 2016
2d68f6f
Fix typo
s0ph1e Apr 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion test/unit/file-handlers/css-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ describe('Css handler', function () {

beforeEach(function() {
scraper = new Scraper(defaultScraperOpts);
scraper.prepare();
});

describe('#loadCss(context, resource)', function() {
Expand Down
59 changes: 16 additions & 43 deletions test/unit/file-handlers/html-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,13 @@ var _ = require('lodash');
var Promise = require('bluebird');
var sinon = require('sinon');
require('sinon-as-promised')(Promise);
var nock = require('nock');
var fs = require('fs-extra');
var Scraper = require('../../../lib/scraper');
var Resource = require('../../../lib/resource');
var loadHtml = require('../../../lib/file-handlers/html');

var testDirname = __dirname + '/.html-test';
var defaultScraperOpts = {
urls: [ 'http://example.com' ],
directory: testDirname,
directory: __dirname + '/.html-test',
sources: [
{ selector: 'img', attr: 'src' },
{ selector: 'img', attr: 'srcset' },
Expand All @@ -26,16 +23,7 @@ var scraper;
describe('Html handler', function () {

beforeEach(function() {
nock.cleanAll();
nock.disableNetConnect();
scraper = new Scraper(defaultScraperOpts);
scraper.prepare();
});

afterEach(function() {
nock.cleanAll();
nock.enableNetConnect();
fs.removeSync(testDirname);
});

describe('#loadHtml(context, resource)', function() {
Expand Down Expand Up @@ -96,21 +84,19 @@ describe('Html handler', function () {
});

it('should not call loadResource if no sources in html', function(done) {
var loadResourceSpy = sinon.spy(scraper, 'loadResource');
var loadResourceStub = sinon.stub(scraper, 'loadResource').resolves();

var po = new Resource('http://example.com', 'index.html');
po.setText('');

loadHtml(scraper, po).then(function() {
loadResourceSpy.called.should.be.eql(false);
loadResourceStub.called.should.be.eql(false);
done();
}).catch(done);
});

it('should not call loadResource if source attr is empty', function(done) {
nock('http://example.com').get('/test.png').reply(200, 'OK');

var loadResourceSpy = sinon.spy(scraper, 'loadResource');
var loadResourceStub = sinon.stub(scraper, 'loadResource').resolves();

var html = ' \
<html lang="en"> \
Expand All @@ -123,15 +109,13 @@ describe('Html handler', function () {
po.setText(html);

loadHtml(scraper, po).then(function() {
loadResourceSpy.called.should.be.eql(false);
loadResourceStub.called.should.be.eql(false);
done();
}).catch(done);
});

it('should call loadResource once with correct params', function(done) {
nock('http://example.com').get('/test.png').reply(200, 'OK');

var loadResourceSpy = sinon.spy(scraper, 'loadResource');
var loadResourceStub = sinon.stub(scraper, 'loadResource').resolves();

var html = ' \
<html lang="en"> \
Expand All @@ -144,18 +128,18 @@ describe('Html handler', function () {
po.setText(html);

loadHtml(scraper, po).then(function() {
loadResourceSpy.calledOnce.should.be.eql(true);
loadResourceSpy.args[0][0].url.should.be.eql('http://example.com/test.png');
loadResourceStub.calledOnce.should.be.eql(true);
loadResourceStub.args[0][0].url.should.be.eql('http://example.com/test.png');
done();
}).catch(done);
});

it('should call loadResource for each found source with correct params', function(done) {
nock('http://example.com').get('/a.jpg').reply(200, 'OK');
nock('http://example.com').get('/b.css').reply(200, 'OK');
nock('http://example.com').get('/c.js').reply(200, 'OK');
var loadResourceStub = sinon.stub(scraper, 'loadResource');
loadResourceStub.onFirstCall().resolves(new Resource('http://example.com/a.jpg', 'a.jpg'));
loadResourceStub.onSecondCall().resolves(new Resource('http://example.com/b.css', 'b.css'));
loadResourceStub.onThirdCall().resolves(new Resource('http://example.com/c.js', 'c.js'));

var loadResourceSpy = sinon.spy(scraper, 'loadResource');
var html = '\
<html> \
<head> \
Expand All @@ -174,19 +158,17 @@ describe('Html handler', function () {

// order of loading is determined by order of sources in scraper options
loadHtml(scraper, parentResource).then(function() {
loadResourceSpy.calledThrice.should.be.eql(true);
loadResourceSpy.args[0][0].url.should.be.eql('http://example.com/a.jpg');
loadResourceSpy.args[1][0].url.should.be.eql('http://example.com/b.css');
loadResourceSpy.args[2][0].url.should.be.eql('http://example.com/c.js');
loadResourceStub.calledThrice.should.be.eql(true);
loadResourceStub.args[0][0].url.should.be.eql('http://example.com/a.jpg');
loadResourceStub.args[1][0].url.should.be.eql('http://example.com/b.css');
loadResourceStub.args[2][0].url.should.be.eql('http://example.com/c.js');

updateChildSpy.calledThrice.should.be.eql(true);
done();
}).catch(done);
});

it('should not replace the sources in text, for which loadResource returned null', function(done) {
nock('http://example.com').get('/scripts/c.js').once().reply(200, 'OK');

var loadStub = sinon.stub(scraper, 'loadResource');
loadStub.onFirstCall().returns(Promise.resolve(null));
loadStub.onSecondCall().returns(Promise.resolve(null));
Expand Down Expand Up @@ -225,10 +207,6 @@ describe('Html handler', function () {
});

it('should replace all sources in text with local files', function(done) {
nock('http://example.com').get('/public/img/a.jpg').reply(200, 'OK');
nock('http://example.com').get('/b.css').reply(200, 'OK');
nock('http://example.com').get('/scripts/c.js').once().reply(200, 'OK');

var loadStub = sinon.stub(scraper, 'loadResource');
loadStub.onFirstCall().returns(Promise.resolve(new Resource('http://example.com/public/img/a.jpg', 'local/a.jpg')));
loadStub.onSecondCall().returns(Promise.resolve(new Resource('http://example.com/b.css', 'local/b.css')));
Expand Down Expand Up @@ -262,8 +240,6 @@ describe('Html handler', function () {
});

it('should keep hash in url for html resources', function (done) {
nock('http://example.com').get('/page1.html').reply(200, 'OK');

var resourceStub = new Resource('http://example.com/page1.html', 'local/page1.html');
sinon.stub(resourceStub, 'getType').returns('html');
sinon.stub(scraper, 'loadResource').returns(Promise.resolve(resourceStub));
Expand All @@ -287,8 +263,6 @@ describe('Html handler', function () {
});

it('should remove hash from url for not-html resources', function (done) {
nock('http://example.com').get('/page1.html').reply(200, 'OK');

var resourceStub = new Resource('http://example.com/page1.html', 'local/page1.html');
sinon.stub(resourceStub, 'getType').returns('other');
sinon.stub(scraper, 'loadResource').returns(Promise.resolve(resourceStub));
Expand Down Expand Up @@ -431,7 +405,6 @@ describe('Html handler', function () {
defaultFilename: 'index.html',
prettifyUrls: true
}, defaultScraperOpts));
scraper.prepare();

var loadStub = sinon.stub(scraper, 'loadResource');
loadStub.onFirstCall().returns(Promise.resolve(new Resource('http://example.com/other-page/index.html', 'other-page/index.html')));
Expand Down
4 changes: 2 additions & 2 deletions test/unit/file-name-generators/by-site-structure-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ var bySiteStructureFilenameGenerator = require('../../../lib/filename-generators

var options = { defaultFilename: 'index.html' };

describe('byTypeFilenameGenerator', function() {
describe('byStructureFilenameGenerator', function() {
it('should return the normalized absolute path of the resource url', function(){
var r1 = new Resource('http://example.com/some/path/a.png');
bySiteStructureFilenameGenerator(r1, options).should.equal('/some/path/a.png');
Expand Down Expand Up @@ -41,5 +41,5 @@ describe('byTypeFilenameGenerator', function() {
it('should normalize to safe absolute paths, without ..', function(){
var r = new Resource('http://example.com/some/path/../../../../images/a.png');
bySiteStructureFilenameGenerator(r, options).should.equal('/images/a.png');
})
});
});
Loading