Merge remote-tracking branch 'origin/main' into test/383-account-settings

Author: nsemets

.github/counter/counter.test.display.js

@@ -0,0 +1,17 @@
+const fs = require('fs');
+const path = require('path');
+
+const filePath = path.join(__dirname, 'counter.txt');
+
+try {
+  // Read current value
+  let current = 0;
+  if (fs.existsSync(filePath)) {
+    const content = fs.readFileSync(filePath, 'utf8').trim();
+    current = parseInt(content, 10) || 0;
+  }
+
+  console.info(`\n\nTests ran: ${current}\n\n`);
+} catch (err) {
+  console.error('Error updating counter:', err.message);
+}

.github/counter/counter.test.increment.js

@@ -0,0 +1,22 @@
+const fs = require('fs');
+const path = require('path');
+
+const filePath = path.join(__dirname, 'counter.txt');
+
+try {
+  // Read current value
+  let current = 0;
+  if (fs.existsSync(filePath)) {
+    const content = fs.readFileSync(filePath, 'utf8').trim();
+    current = parseInt(content, 10) || 0;
+  }
+
+  // Increment
+  const updated = current + 1;
+
+  // Write back
+  fs.writeFileSync(filePath, String(updated));
+  console.info(`\n\nCounter updated: ${current} → ${updated}\n\n`);
+} catch (err) {
+  console.error('Error updating counter:', err.message);
+}

.github/scripts/check-coverage-thresholds.js

@@ -0,0 +1,31 @@
+const fs = require('fs');
+const { execSync } = require('child_process');
+const coverage = require('../../coverage/coverage-summary.json');
+const jestConfig = require('../../jest.config.js');
+
+const summary = coverage.total;
+const thresholds = jestConfig.coverageThreshold.global;
+
+let failed = false;
+const errors = [];
+for (const key of ['branches', 'functions', 'lines', 'statements']) {
+  const current = summary[key].pct;
+  const threshold = thresholds[key];
+  if (current > threshold) {
+    errors.push(
+      `Coverage for ${key} (${current}%) is above the threshold (${threshold}%).\n\tPlease update the coverageThreshold.global.${key} in the jest.config.js to ${current}!`
+    )
+    failed = true;
+  }
+}
+
+if (failed) {
+  execSync('clear', { stdio: 'inherit' });
+  console.log('\n\nCongratulations! You have successfully run the coverage check and added tests.');
+  console.log('\n\nThe jest.config.js file is not insync with your new test additions.');
+  console.log('Please update the coverage thresholds in jest.config.js.');
+  console.log('You will need to commit again once you have updated the jst.config.js file.');
+  console.log('This is only necessary until we hit 100% coverage.\n\n');
+  errors.forEach(err => console.error(`${err}\n`));
+  process.exit(1);
+}

.github/workflows/test.yml

@@ -0,0 +1,29 @@
+name: Run Jest Tests
+
+on:
+  pull_request:
+    branches: ['*'] # or change to match your default branch
+  push:
+    branches: ['*']
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Use Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22.13.1
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Run Jest tests with coverage
+        run: npm run ci
+
+      - name: Check coverage thresholds
+        run: npm run test:check-coverage-thresholds

.gitignore

@@ -37,6 +37,8 @@ yarn-error.log
 testem.log
 /typings
 
+.github/counter/counter.txt
+
 # System files
 .DS_Store
 Thumbs.db

.husky/pre-commit

@@ -1 +1,4 @@
-npx lint-staged
+npx lint-staged || {
+  printf "\n\nERROR: Linting issues were found in the committed files. Please address them before proceeding.\n\n\n\n"
+  exit 1
+}

.husky/pre-push

@@ -0,0 +1,11 @@
+npm run build
+
+npm run test:coverage || {
+  printf "\n\nERROR: Testing errors or coverage issues were found. Please address them before proceeding.\n\n\n\n"
+  exit 1
+}
+
+npm run test:check-coverage-thresholds || {
+  printf "\n\nERROR: Coverage thresholds were not met. Please address them before proceeding.\n\n\n\n"
+  exit 1
+}

.vscode/settings.json

@@ -5,9 +5,7 @@
     "source.fixAll.stylelint": "explicit",
     "source.fixAll.eslint": "explicit"
   },
-  "[html]": {
-    "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
   "scss.lint.unknownAtRules": "ignore",
   "eslint.validate": ["json"]
 }

eslint.config.js

@@ -85,5 +85,11 @@ module.exports = tseslint.config(
     files: ['**/*.html'],
     extends: [...angular.configs.templateRecommended, ...angular.configs.templateAccessibility],
     rules: {},
+  },
+  {
+    files: ['**/*.spec.ts'],
+    rules: {
+      '@typescript-eslint/no-explicit-any': 'off',
+    },
   }
 );

jest.config.js

@@ -1,6 +1,9 @@
 module.exports = {
   preset: 'jest-preset-angular',
   setupFilesAfterEnv: ['<rootDir>/setup-jest.ts'],
+  globalSetup: '<rootDir>/jest.global-setup.ts',
+  collectCoverage: true,
+  coverageReporters: ['json-summary', 'lcov', 'clover'],
   moduleNameMapper: {
     '^@osf/(.*)$': '<rootDir>/src/app/$1',
     '^@core/(.*)$': '<rootDir>/src/app/core/$1',
@@ -24,16 +27,39 @@ module.exports = {
   coverageDirectory: 'coverage',
   collectCoverageFrom: [
     'src/app/**/*.{ts,js}',
+    '!src/app/app.config.ts',
+    '!src/app/**/*.routes.{ts.js}',
+    '!src/app/**/*.models.{ts.js}',
+    '!src/app/**/*.model.{ts.js}',
+    '!src/app/**/*.route.{ts,js}',
     '!src/app/**/*.spec.{ts,js}',
     '!src/app/**/*.module.ts',
     '!src/app/**/index.ts',
     '!src/app/**/public-api.ts',
   ],
   extensionsToTreatAsEsm: ['.ts'],
+  coverageThreshold: {
+    global: {
+      branches: 11.2,
+      functions: 11.34,
+      lines: 36.73,
+      statements: 37.33,
+    },
+  },
   testPathIgnorePatterns: [
+    '<rootDir>/src/app/app.config.ts',
+    '<rootDir>/src/app/app.routes.ts',
     '<rootDir>/src/app/features/registry/',
     '<rootDir>/src/app/features/project/',
     '<rootDir>/src/app/features/registries/',
+    '<rootDir>/src/app/features/settings/addons/',
+    '<rootDir>/src/app/features/settings/developer-apps/',
+    '<rootDir>/src/app/features/settings/notifications/',
+    '<rootDir>/src/app/features/settings/settings-container.component.ts',
+    '<rootDir>/src/app/features/settings/tokens/components/',
+    '<rootDir>/src/app/features/settings/tokens/mappers/',
+    '<rootDir>/src/app/features/settings/tokens/store/',
+    '<rootDir>/src/app/features/settings/tokens/pages/tokens-list/',
     '<rootDir>/src/app/shared/',
   ],
 };