clean up some test stuff

Author: ryanflorence

modules/__tests__/Link-test.js

@@ -28,7 +28,10 @@ describe('Link', () => {
         getChildContext() {
           return {
             router: {
-              createHref: () => CONTEXT_HREF
+              createHref: () => CONTEXT_HREF,
+              blockTransitions: () => {},
+              transitionTo: () => {},
+              replaceWith: () => {}
             }
           }
         }
@@ -254,7 +257,13 @@ describe('Link', () => {
     class TestRouterContext extends React.Component {
       static childContextTypes = { location: PropTypes.object }
       getChildContext() {
-        return { location: { pathname: PATHNAME } }
+        return {
+          location: {
+            pathname: PATHNAME,
+            search: '',
+            hash: ''
+          }
+        }
       }
       render() { return this.props.children }
     }

modules/__tests__/StaticRouter-test.js

@@ -189,93 +189,4 @@ describe('StaticRouter', () => {
 
     })
   })
-
-  // TODO: maybe these tests just move to Link, Redirect, and NavigationPrompt,
-  //       or like "integration-test.js"
-  describe.skip('context', () => {
-    describe('createHref', () => {
-      it('creates hrefs', () => {
-        const markup = renderToString(
-          <StaticRouter location="/">
-            <Link to="/somewhere"/>
-          </StaticRouter>
-        )
-        expect(markup).toMatch(/\/somewhere/)
-      })
-
-      it('uses createHref prop', () => {
-        const markup = renderToString(
-          <StaticRouter location="/" createHref={(href) => '#'+href}>
-            <Link to="/somewhere"/>
-          </StaticRouter>
-        )
-        expect(markup).toMatch(/#\/somewhere/)
-      })
-    })
-
-    describe('push', () => {
-      it('calls onPush', (done) => {
-        const assert = (location) => {
-          expect(location).toExist()
-          expect(location.pathname).toEqual('/somewhere')
-          done()
-        }
-        renderToString(
-          <StaticRouter location="/" onPush={assert}>
-            {({ location }) => (
-              location.pathname === "/" ? (
-                <Redirect to="/somewhere" push/>
-              ) : (
-                <div>test</div>
-              )
-            )}
-          </StaticRouter>
-        )
-      })
-    })
-
-    describe('replace', () => {
-
-      it('calls onReplace', (done) => {
-        const assert = (location) => {
-          expect(location).toExist()
-          expect(location.pathname).toEqual('/somewhere')
-          done()
-        }
-        renderToString(
-          <StaticRouter location="/" onPush={assert}>
-            {({ location }) => (
-              location.pathname === "/" ? (
-                <Redirect to="/somewhere" push={false}/>
-              ) : (
-                <div>test</div>
-              )
-            )}
-          </StaticRouter>
-        )
-      })
-    })
-
-    describe('block', () => {
-      it('calls onBlock', (done) => {
-        const assert = (location) => {
-          expect(location).toExist()
-          expect(location.pathname).toEqual('/somewhere')
-          done()
-        }
-        renderToString(
-          <StaticRouter location="/" onPush={assert}>
-            {({ location }) => (
-              location.pathname === "/" ? (
-                <Redirect to="/somewhere" replace/>
-              ) : (
-                <div>test</div>
-              )
-            )}
-          </StaticRouter>
-        )
-      })
-    })
-  })
-
 })