Skip to content

Commit cff0bde

Browse files
shivammathurshivammathur
committed
Use composer for codeception setup
1 parent 70d858d commit cff0bde

File tree

4 files changed

+7710
-248
lines changed

4 files changed

+7710
-248
lines changed

‎__tests__/tools.test.ts‎

Lines changed: 1 addition & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -79,93 +79,6 @@ describe('Tools tests', () => {
7979
).toBe('releases/download/v1.2.3/tool.phar');
8080
});
8181

82-
it('checking getCodeceptionUriBuilder', async () => {
83-
expect(await tools.getCodeceptionUriBuilder('3.2.1', 'php56')).toBe(
84-
'releases/3.2.1/php56/codecept.phar'
85-
);
86-
expect(await tools.getCodeceptionUriBuilder('3.2.1', 'php54')).toBe(
87-
'releases/3.2.1/php54/codecept.phar'
88-
);
89-
expect(await tools.getCodeceptionUriBuilder('3.2.1', '')).toBe(
90-
'releases/3.2.1/codecept.phar'
91-
);
92-
});
93-
94-
it('checking getCodeceptionUri', async () => {
95-
expect(await tools.getCodeceptionUri('latest', '5.6')).toBe(
96-
'php56/codecept.phar'
97-
);
98-
expect(await tools.getCodeceptionUri('latest', '7.0')).toBe(
99-
'php56/codecept.phar'
100-
);
101-
expect(await tools.getCodeceptionUri('latest', '7.1')).toBe(
102-
'php56/codecept.phar'
103-
);
104-
expect(await tools.getCodeceptionUri('latest', '7.2')).toBe(
105-
'codecept.phar'
106-
);
107-
expect(await tools.getCodeceptionUri('latest', '7.3')).toBe(
108-
'codecept.phar'
109-
);
110-
expect(await tools.getCodeceptionUri('latest', '7.4')).toBe(
111-
'codecept.phar'
112-
);
113-
expect(await tools.getCodeceptionUri('4.0.0', '7.4')).toBe(
114-
'releases/4.0.0/codecept.phar'
115-
);
116-
expect(await tools.getCodeceptionUri('4.0.0', '5.6')).toBe(
117-
'releases/4.0.0/php56/codecept.phar'
118-
);
119-
expect(await tools.getCodeceptionUri('4.0.0', '7.1')).toBe(
120-
'releases/4.0.0/php56/codecept.phar'
121-
);
122-
expect(await tools.getCodeceptionUri('3.1.0', '7.4')).toBe(
123-
'releases/3.1.0/codecept.phar'
124-
);
125-
expect(await tools.getCodeceptionUri('3.1.0', '5.6')).toBe(
126-
'releases/3.1.0/php54/codecept.phar'
127-
);
128-
expect(await tools.getCodeceptionUri('2.5.4', '7.4')).toBe(
129-
'releases/2.5.4/codecept.phar'
130-
);
131-
expect(await tools.getCodeceptionUri('2.5.4', '5.6')).toBe(
132-
'releases/2.5.4/php54/codecept.phar'
133-
);
134-
expect(await tools.getCodeceptionUri('2.3.4', '7.4')).toBe(
135-
'releases/2.3.4/codecept.phar'
136-
);
137-
expect(await tools.getCodeceptionUri('2.3.4', '5.4')).toBe(
138-
'releases/2.3.4/php54/codecept.phar'
139-
);
140-
expect(await tools.getCodeceptionUri('2.2.4', '5.6')).toBe(
141-
'releases/2.2.4/codecept.phar'
142-
);
143-
expect(await tools.getCodeceptionUri('2.2.4', '7.4')).toBe(
144-
'releases/2.2.4/codecept.phar'
145-
);
146-
expect(await tools.getCodeceptionUri('2.2.4', '5.4')).toBe(
147-
'releases/2.2.4/php54/codecept.phar'
148-
);
149-
expect(await tools.getCodeceptionUri('2.1.7', '5.6')).toBe(
150-
'releases/2.1.7/codecept.phar'
151-
);
152-
expect(await tools.getCodeceptionUri('2.1.7', '5.4')).toBe(
153-
'releases/2.1.7/php54/codecept.phar'
154-
);
155-
expect(await tools.getCodeceptionUri('2.1.5', '5.4')).toBe(
156-
'releases/2.1.5/codecept.phar'
157-
);
158-
expect(await tools.getCodeceptionUri('2.1.5', '7.4')).toBe(
159-
'releases/2.1.5/codecept.phar'
160-
);
161-
expect(await tools.getCodeceptionUri('1.6.9', '7.4')).toBe(
162-
'releases/1.6.9/codecept.phar'
163-
);
164-
expect(await tools.getCodeceptionUri('1.5.0', '7.4')).toBe(
165-
'releases/1.5.0/codecept.phar'
166-
);
167-
});
168-
16982
it('checking addPhive', async () => {
17083
let script: string = await tools.addPhive('1.2.3', '7.4', 'linux');
17184
expect(script).toContain(
@@ -581,7 +494,6 @@ describe('Tools tests', () => {
581494
const listOfTools = [
582495
'blackfire',
583496
'blackfire-player:1.8.1',
584-
'codeception',
585497
'cs2pr',
586498
'deployer',
587499
'does_not_exist',
@@ -635,6 +547,7 @@ describe('Tools tests', () => {
635547
it('checking addTools with composer tool using user/tool as input', async () => {
636548
const listOfTools = [
637549
'composer:v1',
550+
'codeception/codeception',
638551
'hirak/prestissimo',
639552
'narrowspark/automatic-composer-prefetcher',
640553
'robmorgan/phinx'

‎dist/index.js‎

Lines changed: 3 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1786,7 +1786,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
17861786
return result;
17871787
};
17881788
Object.defineProperty(exports, "__esModule", { value: true });
1789-
exports.addTools = exports.addPackage = exports.addDevTools = exports.addArchive = exports.getCleanedToolsList = exports.getComposerUrl = exports.addComposer = exports.getWpCliUrl = exports.getSymfonyUri = exports.getDeployerUrl = exports.getBlackfirePlayerUrl = exports.getPharUrl = exports.addPhive = exports.getCodeceptionUri = exports.getCodeceptionUriBuilder = exports.getUri = exports.parseTool = exports.getToolVersion = void 0;
1789+
exports.addTools = exports.addPackage = exports.addDevTools = exports.addArchive = exports.getCleanedToolsList = exports.getComposerUrl = exports.addComposer = exports.getWpCliUrl = exports.getSymfonyUri = exports.getDeployerUrl = exports.getBlackfirePlayerUrl = exports.getPharUrl = exports.addPhive = exports.getUri = exports.parseTool = exports.getToolVersion = void 0;
17901790
const utils = __importStar(__webpack_require__(163));
17911791
/**
17921792
* Function to get tool version
@@ -1855,77 +1855,6 @@ async function getUri(tool, extension, version, prefix, version_prefix, verb) {
18551855
}
18561856
}
18571857
exports.getUri = getUri;
1858-
/**
1859-
* Helper function to get the codeception url
1860-
*
1861-
* @param version
1862-
* @param suffix
1863-
*/
1864-
async function getCodeceptionUriBuilder(version, suffix) {
1865-
return ['releases', version, suffix, 'codecept.phar']
1866-
.filter(Boolean)
1867-
.join('/');
1868-
}
1869-
exports.getCodeceptionUriBuilder = getCodeceptionUriBuilder;
1870-
/**
1871-
* Function to get the codeception url
1872-
*
1873-
* @param version
1874-
* @param php_version
1875-
*/
1876-
async function getCodeceptionUri(version, php_version) {
1877-
const codecept = await getCodeceptionUriBuilder(version, '');
1878-
const codecept54 = await getCodeceptionUriBuilder(version, 'php54');
1879-
const codecept56 = await getCodeceptionUriBuilder(version, 'php56');
1880-
// Refer to https://codeception.com/builds
1881-
switch (true) {
1882-
case /latest/.test(version):
1883-
switch (true) {
1884-
case /5\.6|7\.[0|1]/.test(php_version):
1885-
return 'php56/codecept.phar';
1886-
case /7\.[2-4]/.test(php_version):
1887-
default:
1888-
return 'codecept.phar';
1889-
}
1890-
case /(^[4-9]|\d{2,})\..*/.test(version):
1891-
switch (true) {
1892-
case /5\.6|7\.[0|1]/.test(php_version):
1893-
return codecept56;
1894-
case /7\.[2-4]/.test(php_version):
1895-
default:
1896-
return codecept;
1897-
}
1898-
case /(^2\.[4-5]\.\d+|^3\.[0-1]\.\d+).*/.test(version):
1899-
switch (true) {
1900-
case /5\.6/.test(php_version):
1901-
return codecept54;
1902-
case /7\.[0-4]/.test(php_version):
1903-
default:
1904-
return codecept;
1905-
}
1906-
case /^2\.3\.\d+.*/.test(version):
1907-
switch (true) {
1908-
case /5\.[4-6]/.test(php_version):
1909-
return codecept54;
1910-
case /^7\.[0-4]$/.test(php_version):
1911-
default:
1912-
return codecept;
1913-
}
1914-
case /(^2\.(1\.([6-9]|\d{2,}))|^2\.2\.\d+).*/.test(version):
1915-
switch (true) {
1916-
case /5\.[4-5]/.test(php_version):
1917-
return codecept54;
1918-
case /5.6|7\.[0-4]/.test(php_version):
1919-
default:
1920-
return codecept;
1921-
}
1922-
case /(^2\.(1\.[0-5]|0\.\d+)|^1\.[6-8]\.\d+).*/.test(version):
1923-
return codecept;
1924-
default:
1925-
return codecept;
1926-
}
1927-
}
1928-
exports.getCodeceptionUri = getCodeceptionUri;
19291858
/**
19301859
* Helper function to get script to setup phive
19311860
*
@@ -2102,7 +2031,7 @@ async function getCleanedToolsList(tools_csv) {
21022031
.map(function (extension) {
21032032
return extension
21042033
.trim()
2105-
.replace(/-agent|behat\/|hirak\/|icanhazstring\/|laravel\/|narrowspark\/automatic-|overtrue\/|phpspec\/|robmorgan\/|symfony\//, '');
2034+
.replace(/-agent|behat\/|codeception\/|hirak\/|icanhazstring\/|laravel\/|narrowspark\/automatic-|overtrue\/|phpspec\/|robmorgan\/|symfony\//, '');
21062035
})
21072036
.filter(Boolean);
21082037
return [...new Set(tools_list)];
@@ -2185,10 +2114,7 @@ async function addTools(tools_csv, php_version, os_version) {
21852114
script += await addArchive(tool, url, os_version, '"-V"');
21862115
break;
21872116
case 'codeception':
2188-
url =
2189-
'https://codeception.com/' +
2190-
(await getCodeceptionUri(version, php_version));
2191-
script += await addArchive(tool, url, os_version, '"-V"');
2117+
script += await addPackage(tool, release, 'codeception/', os_version);
21922118
break;
21932119
case 'composer':
21942120
url = await getComposerUrl(version);

0 commit comments

Comments
 (0)