Merge pull request #412 from GNS-Science/fix/410_hazard_tooltips

Fix/410 hazard tooltips
GNS-Science · Nov 1, 2023 · 15c8248 · 15c8248
2 parents 4a96068 + 52f9de0
commit 15c8248
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/cypress/e2e/HazardCurves.cy.ts b/cypress/e2e/HazardCurves.cy.ts
@@ -67,8 +67,6 @@ describe('Hazard Curves', () => {
     cy.get('[data-testid="ArrowDropDownIcon"]').first().click({ force: true });
     cy.get('li').contains('Christchurch').click({ force: true });
     cy.get('[type="submit"]').click({ force: true });
-    cy.wait(500);
-    cy.get('[role="curve"]').should('have.length', 10);
     cy.get('div[class="visx-legend-label"]').should('contain.text', '400m/s PGA Christchurch 400m/s PGA Wellington');
   });
 

diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
     "lint": "eslint ./src/**/*.{ts,tsx} --quiet --fix",
     "prepush": "yarn test",
     "prepare": "husky install",
-    "version": "auto-changelog -p -o src/CHANGELOG.md --template keepachangelog --commitLimit 10 && git add src/CHANGELOG.md"
+    "version": "auto-changelog -p -o src/CHANGELOG.md --template keepachangelog && git add src/CHANGELOG.md"
   },
   "lint-staged": {
     "./src/**/*.{ts,tsx}": [

diff --git a/src/CHANGELOG.md b/src/CHANGELOG.md
@@ -2,12 +2,29 @@
 
 All notable changes to this project will be documented in this file.
 
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## [v1.2.0](https://github.com/GNS-Science/kororaa/compare/v1.2.0...v1.2.2)
 
-Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
+### Merged
+
+- move cypress fix to right test; [`#409`](https://github.com/GNS-Science/kororaa/pull/409)
+- Feature/406 hazard poe [`#408`](https://github.com/GNS-Science/kororaa/pull/408)
+- update hazard curve poe controls; [`#407`](https://github.com/GNS-Science/kororaa/pull/407)
+- Feature/401 hazard button feedback [`#402`](https://github.com/GNS-Science/kororaa/pull/402)
+- Feature/398 time scales [`#400`](https://github.com/GNS-Science/kororaa/pull/400)
+- fix chrome not scrolling to hash links; [`#397`](https://github.com/GNS-Science/kororaa/pull/397)
+- Feature/390 fault label [`#394`](https://github.com/GNS-Science/kororaa/pull/394)
+- change rate label; [`#391`](https://github.com/GNS-Science/kororaa/pull/391)
+- feature/389 rate tooltip [`#390`](https://github.com/GNS-Science/kororaa/pull/390)
+- Fix/386 menu caps [`#387`](https://github.com/GNS-Science/kororaa/pull/387)
+- update rupture map tooltips; format geojson downloads; reformat tech info page; add ids to tech info headers;   [`#380`](https://github.com/GNS-Science/kororaa/pull/380)
+
+### Commits
+
+- fix cypress tests; [`df848f7`](https://github.com/GNS-Science/kororaa/commit/df848f7a39b3a6e30364be33d04cb4d0431f4d71)
+- skip tests; [`8cc347a`](https://github.com/GNS-Science/kororaa/commit/8cc347a67680fa73efefbfa0850a18ab3ec19e58)
+- add tooltip to rupture map rate control; update mock for cypress; [`094a4ad`](https://github.com/GNS-Science/kororaa/commit/094a4ad10070f5cdaf02eea953f6cad93eb76110)
 
-## [v1.2.0](https://github.com/GNS-Science/kororaa/compare/v1.2.0...v1.2.0)
+## [v1.1.0](https://github.com/GNS-Science/kororaa/compare/v1.0.7...v1.1.0) - 2023-07-25
 
 ### Merged