Skip to content

Commit efc93ab

Browse files
committed
fix tests
1 parent 95e6bbb commit efc93ab

File tree

6 files changed

+53
-35
lines changed

6 files changed

+53
-35
lines changed

libs/remix-solidity/jest.config.js

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
module.exports = {
2+
name: 'remix-solidity',
3+
preset: '../../jest.config.js',
4+
verbose: true,
5+
silent: false, // Silent console messages, specially the 'remix-simulator' ones
6+
transform: {
7+
'^.+\\.[tj]sx?$': 'ts-jest',
8+
},
9+
transformIgnorePatterns: ["/node_modules/", "/dist/", "\\.pnp\\.[^\\\/]+$"],
10+
rootDir: "./",
11+
testTimeout: 40000,
12+
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'html', 'json'],
13+
// Coverage
14+
collectCoverage: true,
15+
coverageReporters: ['text', 'text-summary'],
16+
collectCoverageFrom: [
17+
"**/*.ts",
18+
"!**/sol/**",
19+
"!src/types.ts",
20+
"!src/logger.ts"
21+
],
22+
coverageDirectory: '../../coverage/libs/remix-solidity'
23+
};
24+

libs/remix-solidity/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
"@types/node": "^13.1.1",
4242
"babel-eslint": "^10.0.0",
4343
"babelify": "^10.0.0",
44-
"tape": "^4.6.0",
4544
"typescript": "^3.7.4"
4645
},
4746
"scripts": {

libs/remix-solidity/test/compiler-input.ts

Lines changed: 0 additions & 29 deletions
This file was deleted.
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import { getValidLanguage } from '../src/compiler/compiler-input'
2+
import { Language } from '../src/compiler/types'
3+
4+
describe('compiler-input', () => {
5+
test('getValidLanguage', () => {
6+
const correctYul: Language = 'Yul'
7+
const correctSolidity: Language = 'Solidity'
8+
9+
const yulUpperCase = 'Yul'
10+
const yulLowerCase = 'yul'
11+
12+
const solidityUpperCase = 'Solidity'
13+
const solidityLowerCase = 'solidity'
14+
15+
expect(getValidLanguage(yulLowerCase)).toBe(correctYul)
16+
expect(getValidLanguage(yulUpperCase)).toBe(correctYul)
17+
expect(getValidLanguage(solidityUpperCase)).toBe(correctSolidity)
18+
expect(getValidLanguage(solidityLowerCase)).toBe(correctSolidity)
19+
expect(getValidLanguage(null)).toBe(null)
20+
expect(getValidLanguage(undefined)).toBe(null)
21+
expect(getValidLanguage('')).toBe(null)
22+
expect(getValidLanguage('A')).toBe(null)
23+
expect(getValidLanguage('Something')).toBe(null)
24+
})
25+
})

libs/remix-solidity/tsconfig.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{
22
"extends": "../../tsconfig.base.json",
33
"compilerOptions": {
4-
"types": ["node"],
5-
"esModuleInterop": true
4+
"types": ["jest", "node"]
65
},
76
"include": ["**/*.ts"]
87
}

workspace.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -309,10 +309,10 @@
309309
}
310310
},
311311
"test": {
312-
"builder": "@nrwl/workspace:run-commands",
312+
"builder": "@nrwl/jest:jest",
313313
"options": {
314-
"commands": ["./../../node_modules/.bin/npm-run-all test"],
315-
"cwd": "libs/remix-solidity"
314+
"jestConfig": "libs/remix-solidity/jest.config.js",
315+
"tsConfig": "libs/remix-solidity/tsconfig.spec.json"
316316
}
317317
},
318318
"build": {

0 commit comments

Comments
 (0)