From efced9db32f1f3592848cef21640135ed382cfc3 Mon Sep 17 00:00:00 2001 From: maciek Date: Thu, 22 Jun 2023 13:59:16 +0200 Subject: [PATCH] chore: use generated types from vega protos - update int tests --- apps/explorer-e2e/cypress.config.js | 29 +++++++++++++++++++ apps/governance-e2e/cypress.config.js | 29 +++++++++++++++++++ apps/trading-e2e/cypress.config.js | 3 +- ...ing-deal-ticket-submit-batch-auction.cy.ts | 3 +- ...eal-ticket-submit-monitoring-auction.cy.ts | 3 +- ...g-deal-ticket-submit-opening-auction.cy.ts | 3 +- 6 files changed, 62 insertions(+), 8 deletions(-) diff --git a/apps/explorer-e2e/cypress.config.js b/apps/explorer-e2e/cypress.config.js index 2ce3326ce..0cb019bd3 100644 --- a/apps/explorer-e2e/cypress.config.js +++ b/apps/explorer-e2e/cypress.config.js @@ -1,4 +1,10 @@ const { defineConfig } = require('cypress'); +const webpack = require('webpack'); +const webpackPreprocessor = require('@cypress/webpack-batteries-included-preprocessor'); +const path = require('path'); +const dotenv = require('dotenv'); + +dotenv.config(); module.exports = defineConfig({ reporter: '../../node_modules/cypress-mochawesome-reporter', @@ -7,6 +13,29 @@ module.exports = defineConfig({ setupNodeEvents(on, config) { require('cypress-mochawesome-reporter/plugin')(on); require('@cypress/grep/src/plugin')(config); + + const defaultConfig = webpackPreprocessor.defaultOptions; + defaultConfig.webpackOptions.context = path.resolve(__dirname, './'); + defaultConfig.webpackOptions.module.rules[1].test = /(\.tsx?|\.jsx?)$/; + defaultConfig.webpackOptions.module.rules[1].exclude = [ + /node_modules\/(?!(@vegaprotocol\/protos|protobuf-codec))/, + /browserslist/, + ]; + defaultConfig.webpackOptions.module.rules.push({ + test: /(\.css|\.s[ac]ss)$/i, + use: ['style-loader', 'css-loader', 'sass-loader'], + }); + defaultConfig.webpackOptions.plugins = + defaultConfig.webpackOptions.plugins || []; + defaultConfig.webpackOptions.plugins.push( + new webpack.DefinePlugin({ + 'process.env': JSON.stringify(process.env), + }) + ); + defaultConfig.typescript = require.resolve('typescript'); + + on('file:preprocessor', webpackPreprocessor(defaultConfig)); + return config; }, baseUrl: 'http://localhost:3000', diff --git a/apps/governance-e2e/cypress.config.js b/apps/governance-e2e/cypress.config.js index 93e4080ea..d17d20cfc 100644 --- a/apps/governance-e2e/cypress.config.js +++ b/apps/governance-e2e/cypress.config.js @@ -1,4 +1,10 @@ const { defineConfig } = require('cypress'); +const webpack = require('webpack'); +const webpackPreprocessor = require('@cypress/webpack-batteries-included-preprocessor'); +const path = require('path'); +const dotenv = require('dotenv'); + +dotenv.config(); module.exports = defineConfig({ reporter: '../../node_modules/cypress-mochawesome-reporter', @@ -7,6 +13,29 @@ module.exports = defineConfig({ setupNodeEvents(on, config) { require('cypress-mochawesome-reporter/plugin')(on); require('@cypress/grep/src/plugin')(config); + + const defaultConfig = webpackPreprocessor.defaultOptions; + defaultConfig.webpackOptions.context = path.resolve(__dirname, './'); + defaultConfig.webpackOptions.module.rules[1].test = /(\.tsx?|\.jsx?)$/; + defaultConfig.webpackOptions.module.rules[1].exclude = [ + /node_modules\/(?!(@vegaprotocol\/protos|protobuf-codec))/, + /browserslist/, + ]; + defaultConfig.webpackOptions.module.rules.push({ + test: /(\.css|\.s[ac]ss)$/i, + use: ['style-loader', 'css-loader', 'sass-loader'], + }); + defaultConfig.webpackOptions.plugins = + defaultConfig.webpackOptions.plugins || []; + defaultConfig.webpackOptions.plugins.push( + new webpack.DefinePlugin({ + 'process.env': JSON.stringify(process.env), + }) + ); + defaultConfig.typescript = require.resolve('typescript'); + + on('file:preprocessor', webpackPreprocessor(defaultConfig)); + return config; }, baseUrl: 'http://localhost:4210', diff --git a/apps/trading-e2e/cypress.config.js b/apps/trading-e2e/cypress.config.js index 535fd506a..7667413e2 100644 --- a/apps/trading-e2e/cypress.config.js +++ b/apps/trading-e2e/cypress.config.js @@ -15,8 +15,7 @@ module.exports = defineConfig({ const defaultConfig = webpackPreprocessor.defaultOptions; defaultConfig.webpackOptions.context = path.resolve(__dirname, './'); - defaultConfig.webpackOptions.module.rules[1].test = - /(\.tsx?|\.jsx?|\.mjs)$/; + defaultConfig.webpackOptions.module.rules[1].test = /(\.tsx?|\.jsx?)$/; defaultConfig.webpackOptions.module.rules[1].exclude = [ /node_modules\/(?!(@vegaprotocol\/protos|protobuf-codec))/, /browserslist/, diff --git a/apps/trading-e2e/src/integration/trading-deal-ticket-submit-batch-auction.cy.ts b/apps/trading-e2e/src/integration/trading-deal-ticket-submit-batch-auction.cy.ts index 0837ca649..deb1491ff 100644 --- a/apps/trading-e2e/src/integration/trading-deal-ticket-submit-batch-auction.cy.ts +++ b/apps/trading-e2e/src/integration/trading-deal-ticket-submit-batch-auction.cy.ts @@ -79,8 +79,7 @@ describe( price: '100000', postOnly: false, reduceOnly: false, - expiresAt: - new Date(order.expiresAt as string).getTime().toString() + '000000', + expiresAt: order.expiresAt as string, }); }); } diff --git a/apps/trading-e2e/src/integration/trading-deal-ticket-submit-monitoring-auction.cy.ts b/apps/trading-e2e/src/integration/trading-deal-ticket-submit-monitoring-auction.cy.ts index 94386eb8d..668a8bc03 100644 --- a/apps/trading-e2e/src/integration/trading-deal-ticket-submit-monitoring-auction.cy.ts +++ b/apps/trading-e2e/src/integration/trading-deal-ticket-submit-monitoring-auction.cy.ts @@ -77,8 +77,7 @@ describe( createOrder(order); testOrderSubmission(order, { price: '100000', - expiresAt: - new Date(order.expiresAt as string).getTime().toString() + '000000', + expiresAt: order.expiresAt as string, }); }); } diff --git a/apps/trading-e2e/src/integration/trading-deal-ticket-submit-opening-auction.cy.ts b/apps/trading-e2e/src/integration/trading-deal-ticket-submit-opening-auction.cy.ts index e3aabc436..7f92ab972 100644 --- a/apps/trading-e2e/src/integration/trading-deal-ticket-submit-opening-auction.cy.ts +++ b/apps/trading-e2e/src/integration/trading-deal-ticket-submit-opening-auction.cy.ts @@ -77,8 +77,7 @@ describe( createOrder(order); testOrderSubmission(order, { price: '100000', - expiresAt: - new Date(order.expiresAt as string).getTime().toString() + '000000', + expiresAt: order.expiresAt as string, }); }); }