Fix runAction result if no actions (#331)

Author: s0ph1e

lib/scraper.js

@@ -219,7 +219,7 @@ class Scraper {
 	async runActions (actionName, params) {
 		logger.debug(`run ${this.actions[actionName].length} actions ${actionName}`);
 
-		let result = {};
+		let result = extend(params);
 		for (let action of this.actions[actionName]) {
 			if (typeof action === 'function') {
 				result = await action(extend(params, result));

test/functional/request-function/request-function.test.js renamed to test/functional/request-customization/request.test.js

@@ -19,7 +19,25 @@ describe('Functional: customize request options with plugin', function() {
 		fs.removeSync(testDirname);
 	});
 
-	it('should use function which returns request option for resource ', function() {
+	it('should use options from request property if no beforeRequest actions', function() {
+		nock('http://example.com/').get('/').query({myParam: 122}).reply(200, 'response for url with query');
+
+		const options = {
+			urls: [ 'http://example.com/' ],
+			directory: testDirname,
+			request: {
+				qs: {myParam: 122}
+			}
+		};
+
+		return scrape(options).then(function() {
+			fs.existsSync(testDirname + '/index.html').should.be.eql(true);
+			const indexHtml = fs.readFileSync(testDirname + '/index.html').toString();
+			should(indexHtml).containEql('response for url with query');
+		});
+	});
+
+	it('should use options returned by beforeRequest action', function() {
 		nock('http://example.com/').get('/').query({myParam: 122}).reply(200, 'response for url with query');
 
 		class CustomRequestOptions {

test/unit/scraper-test.js

@@ -405,6 +405,17 @@ describe('Scraper', function () {
 				should(err.message).eql('Error from beforeStart 2');
 			}
 		});
+
+		it('should return passed params as result if no actions to run', async () => {
+			const s = new Scraper({
+				urls: ['http://example.com'],
+				directory: testDirname
+			});
+
+			const result = await s.runActions('beforeRequest', {requestOptions: {a: 1}});
+
+			should(result).eql({requestOptions: {a: 1}});
+		});
 	});
 
 	describe('export defaults', function() {