Merge branch 'develop' of https://github.com/CMSgov/qpp-measures-data …

…into snyk-upgrade-35f4fc4dc3356a6bb744a428c253da45

.github/workflows/pr-feature.yml

@@ -17,7 +17,5 @@ jobs:
           node-version: 18
       - name: Install Dependencies
         run: npm ci
-      - name: Run Mocha Tests
+      - name: Run Unit Tests
         run: npm test
-      - name: Run Jest Tests
-        run: npm run jest:cov

.github/workflows/publish.yml

@@ -16,7 +16,16 @@ jobs:
       - name: Checkout Codebase
         uses: actions/checkout@v4
         with:
+          ref: develop
           fetch-depth: 0 # Ensures fetching of history for all branches and tags
+          token: ${{ secrets.ACTIONS_NICHOLAS_PAT }}
+
+      - name: Ensure 'develop' branch is checked out
+        run: |
+          CURRENT_BRANCH=$(git branch --show-current)
+          if [ "$CURRENT_BRANCH" != "develop" ]; then
+            git checkout develop
+          fi
 
       - name: Configure Node version and registry
         uses: actions/setup-node@v4
@@ -53,7 +62,7 @@ jobs:
             git config user.email noreply@github.com
             git add package.json package-lock.json
             git commit -m "Update version to $VERSION"
-            git push
+            git push --force
           else
             echo "Version is already up to date."
           fi
@@ -67,10 +76,10 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.ACTIONS_NICHOLAS_PAT }}
         run: |
-          git fetch origin develop:develop
+          git config user.name "GitHub actions"
+          git config user.email noreply@github.com
           git fetch origin master:master
           git checkout master
-          git reset --hard origin/master  # Resets the local master branch to match origin/master
           git merge --no-ff develop -m "Merging develop into master via GitHub Action"
           git push origin master
 

CONTRIBUTING.md

@@ -90,12 +90,10 @@ Add or update `cost-national-averages.csv` to `util/benchmarks/$YEAR/` and run `
 
 ## Testing
 
-When making changes to measures-data, include tests in the tests directory and make sure existing tests still pass using:
+When making changes to measures-data, include tests in the .spec.ts files and make sure existing tests still pass using:
 
 ```
 npm test
-npx jest
-npm run jest:cov
 ```
 
 We also use Github Actions CI to run tests on every branch.