Skip to content

Babel 6 / CSS Modules / Rails hot reloading #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Dec 13, 2015
Merged

Babel 6 / CSS Modules / Rails hot reloading #175

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
18b5646
Arrange deps
alex35mil Dec 11, 2015
98c4663
Update linters
alex35mil Dec 11, 2015
d67548b
Update to babel@6
alex35mil Dec 12, 2015
e4832d4
Component oriented structure
alex35mil Dec 12, 2015
832273a
Transfer all assets management to webpack, switch to CSS Modules
alex35mil Dec 12, 2015
aae804d
Make Rails development views hot reloadable
alex35mil Dec 12, 2015
c7577bd
Fix case in dir name
alex35mil Dec 12, 2015
a666689
Fix testing issues with Rails hot reloading setup
justin808 Dec 13, 2015
dda44b2
Fix JS tests
alex35mil Dec 13, 2015
16e770c
npm shrinkwrap
alex35mil Dec 12, 2015
816f3de
Fix Net::ReadTimeout error on the first Capybara test run
alex35mil Dec 13, 2015
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix JS tests
  • Loading branch information
@alex35mil
alex35mil committed Dec 13, 2015
commit dda44b2af06752c1360583a454d340f0fc674c51
6 changes: 3 additions & 3 deletions client/app/bundles/comments/components/CommentBox/CommentList/Comment/Comment.spec.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ describe('Comment', () => {
// const author = findRenderedDOMComponentWithTag(component, 'h2');
// expect(author.className).to.equal('comment-author');
const text = findRenderedDOMComponentWithTag(component, 'span');
expect(text.className).to.equal('comment-text');
expect(text.className).to.equal('js-comment-text');
});

it('shows the author', () => {
const component = renderIntoDocument(
<Comment author="Frank" text="Hi!"/>
);

const author = findRenderedDOMComponentWithClass(component, 'comment-author');
const author = findRenderedDOMComponentWithClass(component, 'js-comment-author');
expect(author.textContent).to.equal('Frank');
});

Expand All @@ -37,7 +37,7 @@ describe('Comment', () => {
<Comment author="Frank" text="Hi!"/>
);

const comment = findRenderedDOMComponentWithClass(component, 'comment-text');
const comment = findRenderedDOMComponentWithClass(component, 'js-comment-text');
expect(comment.textContent).to.equal('Hi!\n');
});
});
8 changes: 8 additions & 0 deletions client/app/libs/testNullCompiler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
const noop = () => null;

require.extensions['.css'] = noop;
require.extensions['.scss'] = noop;
require.extensions['.png'] = noop;
require.extensions['.jpg'] = noop;
require.extensions['.jpeg'] = noop;
require.extensions['.gif'] = noop;
2 changes: 1 addition & 1 deletion client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
},
"homepage": "https://github.com/shakacode/react-webpack-rails-tutorial",
"scripts": {
"test": "NODE_PATH=./app mocha --compilers js:babel-core/register --require ./app/libs/testHelper.js 'app/**/*.spec.@(js|jsx)'",
"test": "NODE_PATH=./app mocha --compilers js:babel-core/register --require ./app/libs/testHelper.js --require ./app/libs/testNullCompiler.js 'app/**/*.spec.@(js|jsx)'",
"test:debug": "npm run test -- --debug-brk",
"start": "node server.js",
"build:client": "NODE_ENV=production webpack --config webpack.client.rails.build.config.js",
Expand Down