Merge pull request #4 from SergeyAkkuratov/lesson42

Lesson42 Приложение Погода с использованием Redux
SergeyAkkuratov · Jul 31, 2024 · 2ca1466 · 2ca1466
2 parents 76433a3 + 101a20d
commit 2ca1466
Show file tree

Hide file tree

Showing 22 changed files with 734 additions and 25 deletions.
diff --git a/.github/workflows/pull_request_check.yml b/.github/workflows/pull_request_check.yml
@@ -37,13 +37,6 @@ jobs:
             - name: Build
               run: |
                   npm run build
-            - name: Pack
-              run: |
-                  npm run pack
-            - name: Publish
-              uses: JS-DevTools/npm-publish@v3
-              with:
-                  token: ${{ secrets.NPM_TOKEN }}
             - name: Setup Pages
               uses: actions/configure-pages@v4
             - name: Upload artifact

diff --git a/FixJSFOMEnvironment.ts b/FixJSFOMEnvironment.ts
diff --git a/jest.config.js b/jest.config.js
@@ -27,7 +27,7 @@ const config = {
     coverageDirectory: "coverage",
 
     // An array of regexp pattern strings used to skip coverage collection
-    coveragePathIgnorePatterns: ["node_modules", "mocks"],
+    coveragePathIgnorePatterns: ["node_modules", "mock"],
 
     // Indicates which provider should be used to instrument code for coverage
     // coverageProvider: "babel",
@@ -65,7 +65,7 @@ const config = {
     // forceCoverageMatch: [],
 
     // A path to a module which exports an async function that is triggered once before all test suites
-    // globalSetup: undefined,
+    // globalSetup: "./src/setup.test.ts",
 
     // A path to a module which exports an async function that is triggered once after all test suites
     // globalTeardown: undefined,
@@ -153,7 +153,7 @@ const config = {
     // snapshotSerializers: [],
 
     // The test environment that will be used for testing
-    testEnvironment: "./FixJSFOMEnvironment.ts",
+    testEnvironment: "jsdom",
 
     // Options that will be passed to the testEnvironment
     // testEnvironmentOptions: {},

diff --git a/mocks/fileMock.js b/mocks/fileMock.js
@@ -0,0 +1 @@
+export default "";
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -40,6 +40,7 @@
         "husky": "^9.0.11",
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
+        "jest-fetch-mock": "^3.0.3",
         "prettier": "^3.2.5",
         "style-loader": "^3.3.4",
         "typescript": "^5.4.4",
@@ -51,5 +52,8 @@
     "lint-staged": {
         "*.{js,ts,html}": "eslint --fix",
         "*.{js,ts,css,md,yml}": "prettier --write"
+    },
+    "dependencies": {
+        "@reduxjs/toolkit": "^2.2.5"
     }
 }