Skip to content
This repository has been archived by the owner on May 11, 2022. It is now read-only.

Commit

Permalink
pr fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@sentilesdal
sentilesdal committed Jan 19, 2022
1 parent 5e80496 commit 2c834be
Show file tree
Hide file tree
Showing 6 changed files with 38 additions and 155 deletions.
3 changes: 2 additions & 1 deletion .eslintrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@
"plugin:@typescript-eslint/eslint-recommended",
"plugin:@typescript-eslint/recommended",
"plugin:testing-library/react",
"plugin:jest-dom/recommended",
"plugin:jsx-a11y/recommended",
"prettier"
],
"plugins": ["tailwindcss", "jsx-a11y", "testing-library"],
"plugins": ["tailwindcss", "jsx-a11y", "testing-library", "jest-dom"],
"overrides": [
{
"files": ["**/*.ts", "**/*.tsx"],
Expand Down
151 changes: 2 additions & 149 deletions jest.config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,67 +5,15 @@ import { Config } from "@jest/types";
*/

const customJestConfig: Config.InitialOptions = {
// All imported modules in your tests should be mocked automatically
// automock: false,

// Stop running tests after `n` failures
// bail: 0,

// The directory where Jest should store its cached dependency information
// cacheDirectory: "/private/var/folders/fx/qlfllj2n1kz9z0c7_mn_8d2w0000gn/T/jest_dx",

// Automatically clear mock calls, instances and results before every test
clearMocks: true,

// Indicates whether the coverage information should be collected while executing the test
// disabled for now, we should turn on in CI
// collectCoverage: true,

// An array of glob patterns indicating a set of files for which coverage information should be collected
// collectCoverageFrom: undefined,

// The directory where Jest should output its coverage files
coverageDirectory: "coverage",

// An array of regexp pattern strings used to skip coverage collection
// coveragePathIgnorePatterns: [
// "/node_modules/"
// ],

// Indicates which provider should be used to instrument code for coverage
coverageProvider: "v8",

// A list of reporter names that Jest uses when writing coverage reports
// coverageReporters: [
// "json",
// "text",
// "lcov",
// "clover"
// ],

// An object that configures minimum threshold enforcement for coverage results
// coverageThreshold: undefined,

// A path to a custom dependency extractor
// dependencyExtractor: undefined,

// Make calling deprecated APIs throw helpful error messages
// errorOnDeprecated: false,

// Force coverage collection from ignored files using an array of glob patterns
// forceCoverageMatch: [],

// A path to a module which exports an async function that is triggered once before all test suites
// globalSetup: undefined,

// A path to a module which exports an async function that is triggered once after all test suites
// globalTeardown: undefined,

// A set of global variables that need to be available in all test environments
// globals: {},

// The maximum amount of workers used to run your tests. Can be specified as % or a number. E.g. maxWorkers: 10% will use 10% of your CPU amount + 1 as the maximum worker number. maxWorkers: 2 will use a maximum of 2 workers.
// maxWorkers: "50%",

// An array of directory names to be searched recursively up from the requiring module's location
// NOTE: if using TypeScript with a baseUrl set to the root directory then you need the below for alias' to work
// NOTE: <rootDir> is necessary instead of '.' to avoid errors with circular dependencies in node_modules:
Expand All @@ -75,50 +23,11 @@ const customJestConfig: Config.InitialOptions = {
// An array of file extensions your modules use
moduleFileExtensions: ["js", "jsx", "ts", "tsx", "json", "node"],

// A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
// moduleNameMapper: {},

// An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
// modulePathIgnorePatterns: [],

// Activates notifications for test results
// notify: false,

// An enum that specifies notification mode. Requires { notify: true }
// notifyMode: "failure-change",

// A preset that is used as a base for Jest's configuration
preset: "ts-jest",

// Run tests from one or more projects
// projects: undefined,

// Use this configuration option to add custom reporters to Jest
// reporters: undefined,

// Automatically reset mock state before every test
// resetMocks: false,

// Reset the module registry before running each individual test
// resetModules: false,

// A path to a custom resolver
// resolver: undefined,

// Automatically restore mock state and implementation before every test
// restoreMocks: false,

// The root directory that Jest should scan for tests and modules within
// rootDir: undefined,

// A list of paths to directories that Jest should use to search for files in
// roots: ["<rootDir>/src"],

// Allows you to use a custom runner instead of Jest's default test runner
// runner: "jest-runner",

// The paths to modules that run some code to configure or set up the testing environment before each test
// setupFiles: [],
roots: ["<rootDir>/src"],

// A list of paths to modules that run some code to configure or set up the testing framework before each test
setupFilesAfterEnv: [
Expand All @@ -129,70 +38,14 @@ const customJestConfig: Config.InitialOptions = {
"@testing-library/react",
],

// The number of seconds after which a test is considered as slow and reported as such in the results.
// slowTestThreshold: 5,

// A list of paths to snapshot serializer modules Jest should use for snapshot testing
// snapshotSerializers: [],

// The test environment that will be used for testing
testEnvironment: "<rootDir>/jest-environment-jsdom.js",

// Options that will be passed to the testEnvironment
// testEnvironmentOptions: {},

// Adds a location field to test results
// testLocationInResults: false,

// The glob patterns Jest uses to detect test files
// testMatch: [
// "**/__tests__/**/*.[jt]s?(x)",
// "**/?(*.)+(spec|test).[tj]s?(x)"
// ],

// An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
// testPathIgnorePatterns: [
// "/node_modules/"
// ],

// The regexp pattern or array of patterns that Jest uses to detect test files
// testRegex: [],

// This option allows the use of a custom results processor
// testResultsProcessor: undefined,

// This option allows use of a custom test runner
// testRunner: "jest-circus/runner",

// This option sets the URL for the jsdom environment. It is reflected in properties such as location.href
// testURL: "http://localhost",

// Setting this value to "fake" allows the use of fake timers for functions such as "setTimeout"
// timers: "real",

// A map from regular expressions to paths to transformers
transform: {
"^.+\\.tsx?$": "ts-jest",
".+\\.(css|styl|less|sass|scss)$": "jest-css-modules-transform",
},

// An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
// transformIgnorePatterns: [
// "/node_modules/",
// "\\.pnp\\.[^\\/]+$"
// ],

// An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
// unmockedModulePathPatterns: undefined,

// Indicates whether each individual test should be reported during the run
// verbose: undefined,

// An array of regexp patterns that are matched against all source file paths before re-running tests in watch mode
// watchPathIgnorePatterns: [],

// Whether to use watchman for file crawling
// watchman: true,
};

export default customJestConfig;
28 changes: 28 additions & 0 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
"eslint-config-react-app": "^6.0.0",
"eslint-config-typescript": "^3.0.0",
"eslint-plugin-flowtype": "^6.0.1",
"eslint-plugin-jest-dom": "^4.0.1",
"eslint-plugin-jsx-a11y": "^6.5.1",
"eslint-plugin-tailwindcss": "^3.1.0",
"eslint-plugin-testing-library": "^5.0.3",
Expand Down
5 changes: 3 additions & 2 deletions src/elf/providers/providers.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,9 @@ export const ALCHEMY_GOERLI_HTTP_URL = `https://eth-goerli.alchemyapi.io/v2/${AL
export const ALCHEMY_MAINNET_HTTP_URL = `https://eth-mainnet.alchemyapi.io/v2/${ALCHEMY_MAINNET_KEY}`;

export const testProvider = new MockProvider();
// eslint-disable-next-line no-var
export var defaultProvider = getProvider();

const provider = getProvider();
export const defaultProvider = provider;

// Default rpc host to local, but check the chain id in the addresses.json for
// final say
Expand Down
5 changes: 2 additions & 3 deletions src/test/helpers/initializeGovernance.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,8 @@ export async function initializeGovernance(
): Promise<void> {
const signers: Wallet[] = await testProvider.getWallets();
const [owner, signer1] = signers;
const accounts = signers.map((s) => s.address);
const { elementToken, lockingVault, vestingVault, treasury } =
governanceContracts;
// const accounts = signers.map((s) => s.address);
const { elementToken, lockingVault } = governanceContracts;

await giveVotingPowerToAccount(owner, elementToken, lockingVault);
await giveVotingPowerToAccount(signer1, elementToken, lockingVault);
Expand Down

0 comments on commit 2c834be

Please sign in to comment.