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 | |
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')
-rw-r--r-- | spec/controllers/api/v1/accounts_controller_spec.rb | 7 | ||||
-rw-r--r-- | spec/features/log_in_spec.rb | 2 | ||||
-rw-r--r-- | spec/javascript/components/avatar.test.jsx | 2 | ||||
-rw-r--r-- | spec/javascript/components/button.test.jsx | 2 | ||||
-rw-r--r-- | spec/javascript/components/display_name.test.jsx | 2 | ||||
-rw-r--r-- | spec/javascript/components/dropdown_menu.test.jsx | 2 | ||||
-rw-r--r-- | spec/javascript/components/features/ui/components/column.test.jsx | 4 | ||||
-rw-r--r-- | spec/javascript/components/loading_indicator.test.jsx | 2 |
8 files changed, 10 insertions, 13 deletions
diff --git a/spec/controllers/api/v1/accounts_controller_spec.rb b/spec/controllers/api/v1/accounts_controller_spec.rb index ed49779b4..d69d9c4c2 100644 --- a/spec/controllers/api/v1/accounts_controller_spec.rb +++ b/spec/controllers/api/v1/accounts_controller_spec.rb @@ -27,14 +27,11 @@ RSpec.describe Api::V1::AccountsController, type: :controller do describe 'PATCH #update_credentials' do describe 'with valid data' do before do - avatar = File.read(Rails.root.join('app', 'assets', 'images', 'logo.png')) - header = File.read(Rails.root.join('app', 'assets', 'images', 'mastodon-getting-started.png')) - patch :update_credentials, params: { display_name: "Alice Isn't Dead", note: "Hi!\n\nToot toot!", - avatar: "data:image/png;base64,#{Base64.encode64(avatar)}", - header: "data:image/png;base64,#{Base64.encode64(header)}", + avatar: fixture_file_upload('files/avatar.gif', 'image/gif'), + header: fixture_file_upload('files/attachment.jpg', 'image/jpeg'), } end diff --git a/spec/features/log_in_spec.rb b/spec/features/log_in_spec.rb index 4a634f6b8..f9c222b60 100644 --- a/spec/features/log_in_spec.rb +++ b/spec/features/log_in_spec.rb @@ -11,6 +11,6 @@ feature "Log in" do fill_in "user_password", with: password click_on "Log in" - expect(page).to have_css "div.app-holder[data-react-class=Mastodon]" + expect(page).to have_css "div.app-holder" end end diff --git a/spec/javascript/components/avatar.test.jsx b/spec/javascript/components/avatar.test.jsx index 7131bbec7..f70173880 100644 --- a/spec/javascript/components/avatar.test.jsx +++ b/spec/javascript/components/avatar.test.jsx @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { render } from 'enzyme'; -import Avatar from '../../../app/assets/javascripts/components/components/avatar' +import Avatar from '../../../app/javascript/mastodon/components/avatar' describe('<Avatar />', () => { const src = '/path/to/image.jpg'; diff --git a/spec/javascript/components/button.test.jsx b/spec/javascript/components/button.test.jsx index 13bbe95a2..c32fae32a 100644 --- a/spec/javascript/components/button.test.jsx +++ b/spec/javascript/components/button.test.jsx @@ -2,7 +2,7 @@ import { expect } from 'chai'; import { shallow } from 'enzyme'; import sinon from 'sinon'; -import Button from '../../../app/assets/javascripts/components/components/button'; +import Button from '../../../app/javascript/mastodon/components/button'; describe('<Button />', () => { it('renders a button element', () => { diff --git a/spec/javascript/components/display_name.test.jsx b/spec/javascript/components/display_name.test.jsx index e5a932f4b..7072e653e 100644 --- a/spec/javascript/components/display_name.test.jsx +++ b/spec/javascript/components/display_name.test.jsx @@ -2,7 +2,7 @@ import { expect } from 'chai'; import { render } from 'enzyme'; import Immutable from 'immutable'; -import DisplayName from '../../../app/assets/javascripts/components/components/display_name' +import DisplayName from '../../../app/javascript/mastodon/components/display_name' describe('<DisplayName />', () => { it('renders display name + account name', () => { diff --git a/spec/javascript/components/dropdown_menu.test.jsx b/spec/javascript/components/dropdown_menu.test.jsx index ef3b25a60..717bd51ac 100644 --- a/spec/javascript/components/dropdown_menu.test.jsx +++ b/spec/javascript/components/dropdown_menu.test.jsx @@ -2,7 +2,7 @@ import { expect } from 'chai'; import { shallow, mount } from 'enzyme'; import sinon from 'sinon'; -import DropdownMenu from '../../../app/assets/javascripts/components/components/dropdown_menu'; +import DropdownMenu from '../../../app/javascript/mastodon/components/dropdown_menu'; import Dropdown, { DropdownTrigger, DropdownContent } from 'react-simple-dropdown'; describe('<DropdownMenu />', () => { 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', () => { diff --git a/spec/javascript/components/loading_indicator.test.jsx b/spec/javascript/components/loading_indicator.test.jsx index 677ff4aaf..a372640be 100644 --- a/spec/javascript/components/loading_indicator.test.jsx +++ b/spec/javascript/components/loading_indicator.test.jsx @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { shallow } from 'enzyme'; -import LoadingIndicator from '../../../app/assets/javascripts/components/components/loading_indicator' +import LoadingIndicator from '../../../app/javascript/mastodon/components/loading_indicator' describe('<LoadingIndicator />', () => { |