Merge 7c7958e into 4e07784

actuallyReallyAlex · Sep 28, 2019 · db9051a · db9051a
2 parents 4e07784 + 7c7958e
commit db9051a
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git a/cypress/integration/Map-spec.js b/cypress/integration/Map-spec.js
@@ -58,6 +58,10 @@ describe('Map', () => {
   })
 
   it('Should travel to a planet.', () => {
+    const stub = cy.stub()
+
+    cy.on('window:alert', stub)
+
     const destinationPlanet = mockState.world.planets.find(
       planet => planet.name !== mockState.ship.location.name
     )
@@ -66,6 +70,10 @@ describe('Map', () => {
     cy.wait(1000)
     cy.get('body').contains(`Warping to ${destinationPlanet.name}...`)
     cy.wait(11000)
-    cy.get('body').contains('Warp complete!')
+    cy.get('body')
+      .contains('Warp complete!')
+      .then(() => {
+        expect(stub.getCall(0)).to.be.calledWith(destinationPlanet.name)
+      })
   })
 })
diff --git a/src/components/TravelPrompt.js b/src/components/TravelPrompt.js
@@ -50,7 +50,7 @@ const mapStateToProps = () => ({})
 
 const mapDispatchToProps = dispatch => ({
   handleTravel: (destination, setOpen) => {
-    hidePlanets(destination)
+    hidePlanets(destination, dispatch)
     // dispatch(instantTravel(destination))
     setOpen(false)
   }

diff --git a/src/util/map.js b/src/util/map.js
@@ -1,4 +1,5 @@
 import * as d3 from 'd3'
+import { setShipLocation } from '../redux/actions/ship'
 
 const radius = 23
 const fill = '#1976d2'
@@ -210,21 +211,21 @@ export const getHeight = selector =>
 
 export const getWidth = selector => d3.select(selector).property('clientWidth')
 
-export const hidePlanets = destination => {
+export const hidePlanets = (destination, dispatch) => {
   d3.selectAll('g').style('pointer-events', 'none')
   let value = 1.0
   const interval = setInterval(() => {
     if (value <= 0) {
       clearInterval(interval)
       d3.selectAll('g').remove()
-      showWarpingTo(destination)
+      showWarpingTo(destination, dispatch)
     }
     d3.selectAll('g').style('opacity', value - 0.05)
     value -= 0.05
   }, 100)
 }
 
-const showWarpingTo = destination => {
+const showWarpingTo = (destination, dispatch) => {
   const svg = d3.select('#map-root > svg')
   const height = getHeight('#map-root > svg')
   const width = getWidth('#map-root > svg')
@@ -242,5 +243,8 @@ const showWarpingTo = destination => {
       .text('Warp complete!')
       .attr('x', () => width / 2 - getLabelWidth(svg, `#warping-to`) / 2)
       .attr('y', height / 2)
+
+    dispatch(setShipLocation(destination))
+    alert(destination.name)
   }, 10000)
 }