Compare commits

..

7 Commits

Author SHA1 Message Date
Chris b3abd3159d 1.3.1 2016-01-29 13:54:38 +01:00
Chris f56a70b13d Fix: Removed karma-phantomjs-shim from packages list and karma (it is no longer needed in phantomjs 2) 2016-01-29 13:54:28 +01:00
Chris 1a12e83eb0 1.3.0 2016-01-29 13:32:49 +01:00
Chris d0720735be Updated phantomjs to 2.0 2016-01-29 13:32:39 +01:00
Chris 32fb22fbe6 1.2.1 2016-01-13 07:51:50 +01:00
Chris 9c921f608d Adjusted changelog for v1.2.1 2016-01-13 07:51:40 +01:00
Chris 834fe2569d Updated lodash to current stable, cleaned up unit test formatting 2016-01-13 07:50:37 +01:00
4 changed files with 25 additions and 13 deletions
+13
View File
@@ -1,5 +1,18 @@
# react-webpack-template - Changelog
## 1.3.1:
1. Removed karma-phantomjs-shim (with PhantomJS 2 there is no need for shims anymore)
## 1.3.0:
1. Updated phantomjs to 2.0
## 1.2.1:
1. Updated lodash to latest stable version
2. Cleaned up formatting of unittests
## 1.2.0:
1. Updated core-js to new 2.0 stable
+1 -1
View File
@@ -9,7 +9,7 @@ module.exports = function(config) {
],
port: 8080,
captureTimeout: 60000,
frameworks: [ 'phantomjs-shim', 'mocha', 'chai' ],
frameworks: [ 'mocha', 'chai' ],
client: {
mocha: {}
},
+4 -5
View File
@@ -1,6 +1,6 @@
{
"name": "react-webpack-template",
"version": "1.2.0",
"version": "1.3.1",
"description": "A base skeleton template for react and webpack without task runners",
"main": "server.js",
"scripts": {
@@ -56,16 +56,15 @@
"karma-coverage": "^0.5.3",
"karma-mocha": "^0.2.0",
"karma-mocha-reporter": "^1.1.1",
"karma-phantomjs-launcher": "^0.2.1",
"karma-phantomjs-shim": "^1.1.1",
"karma-phantomjs-launcher": "^1.0.0",
"karma-sourcemap-loader": "^0.3.5",
"karma-webpack": "^1.7.0",
"lodash": "^3.10.1",
"lodash": "^4.0.0",
"minimist": "^1.2.0",
"mocha": "^2.2.5",
"null-loader": "^0.1.1",
"open": "0.0.5",
"phantomjs": "^1.9.18",
"phantomjs-prebuilt": "^2.0.0",
"react-addons-test-utils": "^0.14.0",
"react-hot-loader": "^1.2.9",
"rimraf": "^2.4.3",
+7 -7
View File
@@ -11,13 +11,13 @@ import createComponent from 'helpers/shallowRenderHelper';
import Main from 'components/Main';
describe('MainComponent', () => {
let MainComponent;
let MainComponent;
beforeEach(() => {
MainComponent = createComponent(Main);
});
beforeEach(() => {
MainComponent = createComponent(Main);
});
it('should have its component name as default className', () => {
expect(MainComponent.props.className).to.equal('index');
});
it('should have its component name as default className', () => {
expect(MainComponent.props.className).to.equal('index');
});
});