Skip to content

Commit 691f80b

Browse files
committed
updated cb second value into object
1 parent 3b23df1 commit 691f80b

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

lib/utils/options/fileReplace.js

+14-2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ const fileReplace = module.exports = {};
2525
* @return {Object}
2626
*/
2727
fileReplace.replace = (filepath, options, cb) => {
28+
let result;
2829
const optionsDefault = {
2930
prefix: '',
3031
regex: rcs.selectorLibrary.getAll({
@@ -55,7 +56,12 @@ fileReplace.replace = (filepath, options, cb) => {
5556

5657
data = data.replace(options.regex, getSelector);
5758

58-
return cb(null, data);
59+
result = {
60+
filepath: filepath,
61+
data: data
62+
}
63+
64+
return cb(null, result);
5965
});
6066

6167
/**
@@ -78,6 +84,7 @@ fileReplace.replace = (filepath, options, cb) => {
7884
* @return {[type]} [description]
7985
*/
8086
fileReplace.replaceCss = (filepath, options, cb) => {
87+
let result;
8188
// matches from . or # every character until : or . or ) (for pseudo elements or dots or even in :not(.class))
8289
let regex = /(#|\.)[^\s:\.\{)]+/g;
8390

@@ -106,7 +113,12 @@ fileReplace.replaceCss = (filepath, options, cb) => {
106113

107114
data = data.replace(options.regex, getCssSelector);
108115

109-
return cb(null, data);
116+
result = {
117+
filepath: filepath,
118+
data: data
119+
}
120+
121+
return cb(null, result);
110122
});
111123

112124
/**

test/rcs/fileReplace.spec.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ describe('rcs file replace', () => {
1414
describe('replaceCss', () => {
1515
it('should return the modified css file', done => {
1616
rcs.fileReplace.replaceCss('test/files/fixtures/style.css', (err, data) => {
17-
expect(data).to.equal(fs.readFileSync('test/files/results/style.css', 'utf8'));
17+
expect(data.data).to.equal(fs.readFileSync('test/files/results/style.css', 'utf8'));
1818

1919
done();
2020
});
@@ -43,7 +43,7 @@ describe('rcs file replace', () => {
4343
it('should return the modified html file', done => {
4444
rcs.fileReplace.replaceCss('test/files/fixtures/style.css', (err, data) => {
4545
rcs.fileReplace.replace('test/files/fixtures/index.html', (err, data) => {
46-
expect(data).to.equal(fs.readFileSync('test/files/results/index.html', 'utf8'));
46+
expect(data.data).to.equal(fs.readFileSync('test/files/results/index.html', 'utf8'));
4747

4848
done();
4949
});
@@ -54,7 +54,7 @@ describe('rcs file replace', () => {
5454
// `js` file imported as `txt` to avoid having mocha-phantomjs
5555
rcs.fileReplace.replaceCss('test/files/fixtures/style.css', (err, data) => {
5656
rcs.fileReplace.replace('test/files/fixtures/main.txt', (err, data) => {
57-
expect(data).to.equal(fs.readFileSync('test/files/results/main.txt', 'utf8'));
57+
expect(data.data).to.equal(fs.readFileSync('test/files/results/main.txt', 'utf8'));
5858

5959
done();
6060
});

0 commit comments

Comments
 (0)