Skip to content

Commit c1ca3bf

Browse files
JPeer264JPeer264
committed
Test: reorder test files
1 parent 5e1da68 commit c1ca3bf

23 files changed

+73
-66
lines changed

‎lib/process/process.js‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,18 @@ const rcsProcess = (pathString, options, cb) => {
9999
// ⚡️ speed it up with async ⚡️
100100
async.each(filesArray, (filePath, callback) => {
101101
fs.readFile(path.join(options.cwd, filePath), (err, bufferData) => {
102+
let data;
102103
let joinedPath;
103104
let shouldOverwrite = options.overwrite;
104105

105106
if (err) return callback(err);
106107

107-
const data = rcs.replace.buffer(bufferData);
108+
// check wether to replace javascript files or not
109+
if (options.replaceJs) {
110+
data = rcs.replace.bufferJs(bufferData);
111+
} else {
112+
data = rcs.replace.buffer(bufferData);
113+
}
108114

109115
joinedPath = path.join(options.newPath, filePath);
110116

‎lib/process/processSync.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,10 @@ const processSync = (pathString, options) => {
3939

4040
if (options.collectSelectors) {
4141
data = rcs.replace.bufferCss(fs.readFileSync(path.join(options.cwd, filePath)), options);
42+
} else if (options.replaceJS) {
43+
data = rcs.replace.bufferJs(fs.readFileSync(path.join(options.cwd, filePath)), options);
4244
} else {
4345
data = rcs.replace.buffer(fs.readFileSync(path.join(options.cwd, filePath)), options);
44-
4546
}
4647

4748
rcs.helper.saveSync(joinedPath, data, { overwrite: shouldOverwrite });

‎lib/process/tests/process.spec.js‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ describe('process/process', () => {
3232
newPath: testCwd,
3333
cwd: fixturesCwd
3434
}, (err, data) => {
35-
let newFile = fs.readFileSync(testCwd + '/style.css', 'utf8');
36-
let newFile2 = fs.readFileSync(testCwd + '/style2.css', 'utf8');
37-
let newFile3 = fs.readFileSync(testCwd + '/subdirectory/style.css', 'utf8');
38-
let expectedFile = fs.readFileSync(resultsCwd + '/style.css', 'utf8');
39-
let expectedFile2 = fs.readFileSync(resultsCwd + '/style2.css', 'utf8');
40-
let expectedFile3 = fs.readFileSync(resultsCwd + '/subdirectory/style.css', 'utf8');
35+
let newFile = fs.readFileSync(testCwd + '/css/style.css', 'utf8');
36+
let newFile2 = fs.readFileSync(testCwd + '/css/style2.css', 'utf8');
37+
let newFile3 = fs.readFileSync(testCwd + '/css/subdirectory/style.css', 'utf8');
38+
let expectedFile = fs.readFileSync(resultsCwd + '/css/style.css', 'utf8');
39+
let expectedFile2 = fs.readFileSync(resultsCwd + '/css/style2.css', 'utf8');
40+
let expectedFile3 = fs.readFileSync(resultsCwd + '/css/subdirectory/style.css', 'utf8');
4141

4242
expect(err).to.not.exist;
4343
expect(newFile).to.equal(expectedFile);
@@ -54,12 +54,12 @@ describe('process/process', () => {
5454
newPath: testCwd,
5555
cwd: fixturesCwd
5656
}, (err, data) => {
57-
let newFile = fs.readFileSync(testCwd + '/style.css', 'utf8');
58-
let newFile2 = fs.readFileSync(testCwd + '/style2.css', 'utf8');
59-
let newFile3 = fs.readFileSync(testCwd + '/subdirectory/style.css', 'utf8');
60-
let expectedFile = fs.readFileSync(resultsCwd + '/style.css', 'utf8');
61-
let expectedFile2 = fs.readFileSync(resultsCwd + '/style2.css', 'utf8');
62-
let expectedFile3 = fs.readFileSync(resultsCwd + '/subdirectory/style.css', 'utf8');
57+
let newFile = fs.readFileSync(testCwd + '/css/style.css', 'utf8');
58+
let newFile2 = fs.readFileSync(testCwd + '/css/style2.css', 'utf8');
59+
let newFile3 = fs.readFileSync(testCwd + '/css/subdirectory/style.css', 'utf8');
60+
let expectedFile = fs.readFileSync(resultsCwd + '/css/style.css', 'utf8');
61+
let expectedFile2 = fs.readFileSync(resultsCwd + '/css/style2.css', 'utf8');
62+
let expectedFile3 = fs.readFileSync(resultsCwd + '/css/subdirectory/style.css', 'utf8');
6363

6464
expect(err).to.not.exist;
6565
expect(newFile).to.equal(expectedFile);
@@ -77,10 +77,10 @@ describe('process/process', () => {
7777
newPath: testCwd,
7878
cwd: fixturesCwd
7979
}, (err, data) => {
80-
let newFile = fs.readFileSync(testCwd + '/style.css', 'utf8');
81-
let newFile2 = fs.readFileSync(testCwd + '/style2.css', 'utf8');
82-
let expectedFile = fs.readFileSync(resultsCwd + '/style.css', 'utf8');
83-
let expectedFile2 = fs.readFileSync(resultsCwd + '/style2.css', 'utf8');
80+
let newFile = fs.readFileSync(testCwd + '/css/style.css', 'utf8');
81+
let newFile2 = fs.readFileSync(testCwd + '/css/style2.css', 'utf8');
82+
let expectedFile = fs.readFileSync(resultsCwd + '/css/style.css', 'utf8');
83+
let expectedFile2 = fs.readFileSync(resultsCwd + '/css/style2.css', 'utf8');
8484

8585
expect(err).to.not.exist;
8686
expect(newFile).to.equal(expectedFile);

‎lib/process/tests/processSync.spec.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ describe('process/processSync', () => {
3131
let newFile;
3232
let expectedFile;
3333

34-
processCssSync('style.css', {
34+
processCssSync('css/style.css', {
3535
newPath: testCwd,
3636
cwd: fixturesCwd
3737
});
@@ -41,13 +41,13 @@ describe('process/processSync', () => {
4141
cwd: fixturesCwd
4242
});
4343

44-
newFile = fs.readFileSync(testCwd + '/main.txt', 'utf8');
45-
expectedFile = fs.readFileSync(resultsCwd + '/main.txt', 'utf8');
44+
newFile = fs.readFileSync(testCwd + '/js/main.txt', 'utf8');
45+
expectedFile = fs.readFileSync(resultsCwd + '/js/main.txt', 'utf8');
4646

4747
expect(newFile).to.equal(expectedFile);
4848

49-
newFile = fs.readFileSync(testCwd + '/style.css', 'utf8');
50-
expectedFile = fs.readFileSync(resultsCwd + '/style.css', 'utf8');
49+
newFile = fs.readFileSync(testCwd + '/css/style.css', 'utf8');
50+
expectedFile = fs.readFileSync(resultsCwd + '/css/style.css', 'utf8');
5151

5252
expect(newFile).to.equal(expectedFile);
5353
});

‎lib/processCss/tests/processCss.spec.js‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ describe('processCss/processCss', () => {
3232
cwd: fixturesCwd,
3333
prefix: 'prefixed-'
3434
}, (err, data) => {
35-
let newFile = fs.readFileSync(testCwd + '/style.css', 'utf8');
36-
let expectedFile = fs.readFileSync(resultsCwd + '/style-prefix.css', 'utf8');
35+
let newFile = fs.readFileSync(testCwd + '/css/style.css', 'utf8');
36+
let expectedFile = fs.readFileSync(resultsCwd + '/css/style-prefix.css', 'utf8');
3737

3838
expect(err).to.not.exist;
3939
expect(newFile).to.equal(expectedFile);
@@ -47,12 +47,12 @@ describe('processCss/processCss', () => {
4747
newPath: testCwd,
4848
cwd: fixturesCwd
4949
}, (err, data) => {
50-
let newFile = fs.readFileSync(testCwd + '/style.css', 'utf8');
51-
let newFile2 = fs.readFileSync(testCwd + '/style2.css', 'utf8');
52-
let newFile3 = fs.readFileSync(testCwd + '/subdirectory/style.css', 'utf8');
53-
let expectedFile = fs.readFileSync(resultsCwd + '/style.css', 'utf8');
54-
let expectedFile2 = fs.readFileSync(resultsCwd + '/style2.css', 'utf8');
55-
let expectedFile3 = fs.readFileSync(resultsCwd + '/subdirectory/style.css', 'utf8');
50+
let newFile = fs.readFileSync(testCwd + '/css/style.css', 'utf8');
51+
let newFile2 = fs.readFileSync(testCwd + '/css/style2.css', 'utf8');
52+
let newFile3 = fs.readFileSync(testCwd + '/css/subdirectory/style.css', 'utf8');
53+
let expectedFile = fs.readFileSync(resultsCwd + '/css/style.css', 'utf8');
54+
let expectedFile2 = fs.readFileSync(resultsCwd + '/css/style2.css', 'utf8');
55+
let expectedFile3 = fs.readFileSync(resultsCwd + '/css/subdirectory/style.css', 'utf8');
5656

5757
expect(err).to.not.exist;
5858
expect(newFile).to.equal(expectedFile);
@@ -65,8 +65,8 @@ describe('processCss/processCss', () => {
6565

6666
it('should process css files without options', done => {
6767
processCss(fixturesCwd + '/**/style*.css', (err, data) => {
68-
let newFile = fs.readFileSync('./rcs/' + fixturesCwd + '/style.css', 'utf8');
69-
let expectedFile = fs.readFileSync(resultsCwd + '/style.css', 'utf8');
68+
let newFile = fs.readFileSync('./rcs/' + fixturesCwd + '/css/style.css', 'utf8');
69+
let expectedFile = fs.readFileSync(resultsCwd + '/css/style.css', 'utf8');
7070

7171
expect(err).to.not.exist;
7272
expect(newFile).to.equal(expectedFile);
@@ -78,38 +78,38 @@ describe('processCss/processCss', () => {
7878
});
7979

8080
it('should replace the selector attributes correctly', done => {
81-
processCss('css-attributes.css', {
81+
processCss('css/css-attributes.css', {
8282
newPath: testCwd,
8383
cwd: fixturesCwd
8484
}, err => {
85-
expect(fs.readFileSync(testCwd + '/css-attributes.css', 'utf8')).to.equal(fs.readFileSync(resultsCwd + '/css-attributes.css', 'utf8'));
85+
expect(fs.readFileSync(testCwd + '/css/css-attributes.css', 'utf8')).to.equal(fs.readFileSync(resultsCwd + '/css/css-attributes.css', 'utf8'));
8686

8787
done();
8888
});
8989
});
9090

9191
it('should replace the selector attributes with pre and suffixes correctly', done => {
92-
processCss('css-attributes.css', {
92+
processCss('css/css-attributes.css', {
9393
prefix: 'prefix-',
9494
suffix: '-suffix',
9595
newPath: testCwd,
9696
cwd: fixturesCwd
9797
}, err => {
98-
expect(fs.readFileSync(testCwd + '/css-attributes.css', 'utf8')).to.equal(fs.readFileSync(resultsCwd + '/css-attributes-pre-suffix.css', 'utf8'));
98+
expect(fs.readFileSync(testCwd + '/css/css-attributes.css', 'utf8')).to.equal(fs.readFileSync(resultsCwd + '/css/css-attributes-pre-suffix.css', 'utf8'));
9999

100100
done();
101101
});
102102
});
103103

104104
it('should replace the selector attributes without caring about attribute selectors', done => {
105-
processCss('css-attributes.css', {
105+
processCss('css/css-attributes.css', {
106106
prefix: 'prefix-',
107107
suffix: '-suffix',
108108
ignoreAttributeSelector: true,
109109
newPath: testCwd,
110110
cwd: fixturesCwd
111111
}, err => {
112-
expect(fs.readFileSync(testCwd + '/css-attributes.css', 'utf8')).to.equal(fs.readFileSync(resultsCwd + '/css-attributes-ignore.css', 'utf8'));
112+
expect(fs.readFileSync(testCwd + '/css/css-attributes.css', 'utf8')).to.equal(fs.readFileSync(resultsCwd + '/css/css-attributes-ignore.css', 'utf8'));
113113

114114
done();
115115
});

‎lib/processCss/tests/processCssSync.spec.js‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ describe('processCss/processCssSync', () => {
3232
cwd: fixturesCwd
3333
});
3434

35-
let newFile = fs.readFileSync(testCwd + '/style.css', 'utf8');
36-
let newFile2 = fs.readFileSync(testCwd + '/style2.css', 'utf8');
37-
let newFile3 = fs.readFileSync(testCwd + '/subdirectory/style.css', 'utf8');
38-
let expectedFile = fs.readFileSync(resultsCwd + '/style.css', 'utf8');
39-
let expectedFile2 = fs.readFileSync(resultsCwd + '/style2.css', 'utf8');
40-
let expectedFile3 = fs.readFileSync(resultsCwd + '/subdirectory/style.css', 'utf8');
35+
let newFile = fs.readFileSync(testCwd + '/css/style.css', 'utf8');
36+
let newFile2 = fs.readFileSync(testCwd + '/css/style2.css', 'utf8');
37+
let newFile3 = fs.readFileSync(testCwd + '/css/subdirectory/style.css', 'utf8');
38+
let expectedFile = fs.readFileSync(resultsCwd + '/css/style.css', 'utf8');
39+
let expectedFile2 = fs.readFileSync(resultsCwd + '/css/style2.css', 'utf8');
40+
let expectedFile3 = fs.readFileSync(resultsCwd + '/css/subdirectory/style.css', 'utf8');
4141

4242
expect(newFile).to.equal(expectedFile);
4343
expect(newFile2).to.equal(expectedFile2);
@@ -48,14 +48,14 @@ describe('processCss/processCssSync', () => {
4848
processCssSync(['**/style.css', '**/style2.css'], {
4949
newPath: testCwd,
5050
cwd: fixturesCwd
51-
})
51+
});
5252

53-
let newFile = fs.readFileSync(testCwd + '/style.css', 'utf8');
54-
let newFile2 = fs.readFileSync(testCwd + '/style2.css', 'utf8');
55-
let newFile3 = fs.readFileSync(testCwd + '/subdirectory/style.css', 'utf8');
56-
let expectedFile = fs.readFileSync(resultsCwd + '/style.css', 'utf8');
57-
let expectedFile2 = fs.readFileSync(resultsCwd + '/style2.css', 'utf8');
58-
let expectedFile3 = fs.readFileSync(resultsCwd + '/subdirectory/style.css', 'utf8');
53+
let newFile = fs.readFileSync(testCwd + '/css/style.css', 'utf8');
54+
let newFile2 = fs.readFileSync(testCwd + '/css/style2.css', 'utf8');
55+
let newFile3 = fs.readFileSync(testCwd + '/css/subdirectory/style.css', 'utf8');
56+
let expectedFile = fs.readFileSync(resultsCwd + '/css/style.css', 'utf8');
57+
let expectedFile2 = fs.readFileSync(resultsCwd + '/css/style2.css', 'utf8');
58+
let expectedFile3 = fs.readFileSync(resultsCwd + '/css/subdirectory/style.css', 'utf8');
5959

6060
expect(newFile).to.equal(expectedFile);
6161
expect(newFile2).to.equal(expectedFile2);

test/files/fixtures/css-attributes.css renamed to test/files/fixtures/css/css-attributes.css

File renamed without changes.

test/files/fixtures/style.css renamed to test/files/fixtures/css/style.css

File renamed without changes.

test/files/fixtures/style2.css renamed to test/files/fixtures/css/style2.css

File renamed without changes.

test/files/fixtures/subdirectory/style.css renamed to test/files/fixtures/css/subdirectory/style.css

File renamed without changes.

0 commit comments

Comments
 (0)