Skip to content

Commit

Permalink
address review feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
Nate Piche committed Jan 19, 2016
1 parent f73d3e7 commit 975160a
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 12 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,5 @@ node_modules
# Jetbrains IDEs
.idea

# vim swp files
*.swp

/build
_book
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"check": "npm run lint && npm run test:all",
"build": "babel src --out-dir build",
"test:watch": "mocha --compilers js:babel/register --recursive src/**/__tests__/*.js --watch",
"test:describeWithDOMOnly": "mocha --compilers js:babel/register --recursive src/**/__tests__/describeWithDOM/describeWithDOMOnly-spec.js",
"test:describeWithDOMSkip": "mocha --compilers js:babel/register --recursive src/**/__tests__/describeWithDOM/describeWithDOMSkip-spec.js",
"test:describeWithDOMOnly": "mocha --compilers js:babel/register --recursive src/**/__tests__/describeWithDOM/describeWithDOMOnly-spec.js",
"test:describeWithDOMSkip": "mocha --compilers js:babel/register --recursive src/**/__tests__/describeWithDOM/describeWithDOMSkip-spec.js",
"test:all": "npm run react:13 && npm test && npm run test:describeWithDOMOnly && npm run test:describeWithDOMSkip && npm run react:14 && npm test && npm run test:describeWithDOMOnly && npm run test:describeWithDOMSkip",
"react:clean": "rimraf node_modules/react node_modules/react-dom node_modules/react-addons-test-utils",
"react:13": "npm run react:clean && npm i react@0.13",
Expand Down
2 changes: 1 addition & 1 deletion src/__tests__/ReactWrapper-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import {
mount,
render,
ReactWrapper,
describeWithDOM,
} from '../';
import { describeWithDOM } from '../describeWithDOM';
import { describeIf } from './_helpers';
import { REACT013 } from '../version';

Expand Down
4 changes: 1 addition & 3 deletions src/__tests__/Utils-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,9 @@ import {
mapNativeEventNames,
} from '../Utils';
import {
describeWithDOM,
mount,
} from '../';
import {
describeWithDOM,
} from '../describeWithDOM';

describe('Utils', () => {

Expand Down
2 changes: 1 addition & 1 deletion src/__tests__/describeWithDOM/describeWithDOMOnly-spec.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect } from 'chai';
import { describeWithDOM } from '../../describeWithDOM';
import { describeWithDOM } from '../..';

describe('describeWithDOM', () => {
describe('.only()', () => {
Expand Down
4 changes: 2 additions & 2 deletions src/__tests__/describeWithDOM/describeWithDOMSkip-spec.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { expect } from 'chai';
import { describeWithDOM } from '../../describeWithDOM';
import { describeWithDOM } from '../..';

describe('describeWithDOM', () => {
describe('.skip()', () => {
describeWithDOM.skip('will skip tests called with skip', () => {
it('will not run this test', () => {
// purposefully failing test that won't be run
// purposefully failing test that won't be run
expect(true).to.equal(false);
});
});
Expand Down
2 changes: 2 additions & 0 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import cheerio from 'cheerio';
import Sinon from 'sinon';
import ReactWrapper from './ReactWrapper';
import ShallowWrapper from './ShallowWrapper';
import { describeWithDOM } from './describeWithDOM';
import { onPrototype } from './Utils';
import { renderToStaticMarkup } from './react-compat';

Expand Down Expand Up @@ -86,3 +87,4 @@ export function render(node) {

export { ShallowWrapper as ShallowWrapper };
export { ReactWrapper as ReactWrapper };
export { describeWithDOM as describeWithDOM };

0 comments on commit 975160a

Please sign in to comment.