diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-03 02:04:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-03 02:04:16 +0200 |
| commit | f5bf5ebb82e3af420dcd23d602b1be6cc86838e1 (patch) | |
| tree | 92eef08642a038cf44ccbc6d16a884293e7a0814 /spec/javascript/components/features | |
| parent | 26bc5915727e0a0173c03cb49f5193dd612fb888 (diff) | |
Replace sprockets/browserify with Webpack (#2617)
* Replace browserify with webpack * Add react-intl-translations-manager * Do not minify in development, add offline-plugin for ServiceWorker background cache updates * Adjust tests and dependencies * Fix production deployments * Fix tests * More optimizations * Improve travis cache for npm stuff * Re-run travis * Add back support for custom.scss as before * Remove offline-plugin and babili * Fix issue with Immutable.List().unshift(...values) not working as expected * Make travis load schema instead of running all migrations in sequence * Fix missing React import in WarningContainer. Optimize rendering performance by using ImmutablePureComponent instead of React.PureComponent. ImmutablePureComponent uses Immutable.is() to compare props. Replace dynamic callback bindings in <UI /> * Add react definitions to places that use JSX * Add Procfile.dev for running rails, webpack and streaming API at the same time
Diffstat (limited to 'spec/javascript/components/features')
| -rw-r--r-- | spec/javascript/components/features/ui/components/column.test.jsx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/javascript/components/features/ui/components/column.test.jsx b/spec/javascript/components/features/ui/components/column.test.jsx index b7e257757..6359905e6 100644 --- a/spec/javascript/components/features/ui/components/column.test.jsx +++ b/spec/javascript/components/features/ui/components/column.test.jsx @@ -2,8 +2,8 @@ import { expect } from 'chai'; import { mount } from 'enzyme'; import sinon from 'sinon'; -import Column from '../../../../../../app/assets/javascripts/components/features/ui/components/column'; -import ColumnHeader from '../../../../../../app/assets/javascripts/components/features/ui/components/column_header'; +import Column from '../../../../../../app/javascript/mastodon/features/ui/components/column'; +import ColumnHeader from '../../../../../../app/javascript/mastodon/features/ui/components/column_header'; describe('<Column />', () => { describe('<ColumnHeader /> click handler', () => { |