Merge master

PaulLeCam · Oct 4, 2015 · 4709690 · 4709690
2 parents aa46d34 + 91d4220
commit 4709690
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 684 deletions.
diff --git a/src/__tests__/Map.js → __tests__/Map.js b/src/__tests__/Map.js → __tests__/Map.js
@@ -2,10 +2,10 @@ import React from 'react';
 import { findDOMNode, render } from 'react-dom';
 import { renderToStaticMarkup } from 'react-dom/server';
 
-jest.dontMock('../Map');
-jest.dontMock('../MapComponent');
+jest.dontMock('../src/Map');
+jest.dontMock('../src/MapComponent');
 
-const Map = require('../Map');
+const Map = require('../src/Map');
 
 describe('Map', () => {
   beforeEach(() => {

diff --git a/src/__tests__/MapComponent.js → __tests__/MapComponent.js b/src/__tests__/MapComponent.js → __tests__/MapComponent.js
@@ -2,9 +2,9 @@ import Leaflet from 'leaflet';
 import React from 'react';
 import { render } from 'react-dom';
 
-jest.dontMock('../MapComponent');
+jest.dontMock('../src/MapComponent');
 
-const MapComponent = require('../MapComponent');
+const MapComponent = require('../src/MapComponent');
 
 describe('MapComponent', () => {
   class Component extends MapComponent {

diff --git a/src/__tests__/MapLayer.js → __tests__/MapLayer.js b/src/__tests__/MapLayer.js → __tests__/MapLayer.js
@@ -2,12 +2,12 @@ import Leaflet from 'leaflet';
 import React from 'react';
 import { render } from 'react-dom';
 
-jest.dontMock('../MapComponent');
-jest.dontMock('../MapLayer');
-jest.dontMock('../Map');
+jest.dontMock('../src/MapComponent');
+jest.dontMock('../src/MapLayer');
+jest.dontMock('../src/Map');
 
-const MapLayer = require('../MapLayer');
-const Map = require('../Map');
+const MapLayer = require('../src/MapLayer');
+const Map = require('../src/Map');
 
 describe('MapLayer', () => {
   it('passes its `map` prop to its children', () => {

diff --git a/src/__tests__/Marker.js → __tests__/Marker.js b/src/__tests__/Marker.js → __tests__/Marker.js
@@ -1,16 +1,16 @@
 import React from 'react';
 import { render } from 'react-dom';
 
-jest.dontMock('../BaseTileLayer');
-jest.dontMock('../MapComponent');
-jest.dontMock('../MapLayer');
-jest.dontMock('../PopupContainer');
-jest.dontMock('../Map');
-jest.dontMock('../TileLayer');
-jest.dontMock('../Marker');
-jest.dontMock('../index');
+jest.dontMock('../src/BaseTileLayer');
+jest.dontMock('../src/MapComponent');
+jest.dontMock('../src/MapLayer');
+jest.dontMock('../src/PopupContainer');
+jest.dontMock('../src/Map');
+jest.dontMock('../src/TileLayer');
+jest.dontMock('../src/Marker');
+jest.dontMock('../src/index');
 
-const { Map, Marker, TileLayer } = require('../');
+const { Map, Marker, TileLayer } = require('../src/');
 
 describe('Marker', () => {
   it('adds the marker to the map', () => {

diff --git a/src/__tests__/Popup.js → __tests__/Popup.js b/src/__tests__/Popup.js → __tests__/Popup.js
@@ -3,17 +3,17 @@
 import React from 'react';
 import { render } from 'react-dom';
 
-jest.dontMock('../BaseTileLayer');
-jest.dontMock('../MapComponent');
-jest.dontMock('../MapLayer');
-jest.dontMock('../PopupContainer');
-jest.dontMock('../Map');
-jest.dontMock('../Marker');
-jest.dontMock('../Popup');
-jest.dontMock('../TileLayer');
-jest.dontMock('../index');
+jest.dontMock('../src/BaseTileLayer');
+jest.dontMock('../src/MapComponent');
+jest.dontMock('../src/MapLayer');
+jest.dontMock('../src/PopupContainer');
+jest.dontMock('../src/Map');
+jest.dontMock('../src/Marker');
+jest.dontMock('../src/Popup');
+jest.dontMock('../src/TileLayer');
+jest.dontMock('../src/index');
 
-const { Map, Popup, TileLayer } = require('../');
+const { Map, Popup, TileLayer } = require('../src/');
 
 describe('Popup', () => {
   it('adds the popup to the map', () => {

diff --git a/lib/__tests__/Map.js b/lib/__tests__/Map.js