diff options
Diffstat (limited to 'spec')
-rw-r--r-- | spec/javascript/.eslintrc.yml | 3 | ||||
-rw-r--r-- | spec/javascript/components/loading_indicator.test.js | 8 | ||||
-rw-r--r-- | spec/models/tag_spec.rb | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/spec/javascript/.eslintrc.yml b/spec/javascript/.eslintrc.yml new file mode 100644 index 000000000..6db2a46c5 --- /dev/null +++ b/spec/javascript/.eslintrc.yml @@ -0,0 +1,3 @@ +--- +env: + mocha: true diff --git a/spec/javascript/components/loading_indicator.test.js b/spec/javascript/components/loading_indicator.test.js deleted file mode 100644 index 0859dd192..000000000 --- a/spec/javascript/components/loading_indicator.test.js +++ /dev/null @@ -1,8 +0,0 @@ -import { expect } from 'chai'; -import { shallow } from 'enzyme'; -import React from 'react'; -import LoadingIndicator from '../../../app/javascript/mastodon/components/loading_indicator'; - -describe('<LoadingIndicator />', () => { - -}); diff --git a/spec/models/tag_spec.rb b/spec/models/tag_spec.rb index 2496946cb..7c574eabe 100644 --- a/spec/models/tag_spec.rb +++ b/spec/models/tag_spec.rb @@ -11,6 +11,10 @@ RSpec.describe Tag, type: :model do it 'does not match URLs with hashtag-like anchors' do expect(subject.match('https://en.wikipedia.org/wiki/Ghostbusters_(song)#Lawsuit')).to be_nil end + + it 'matches #aesthetic' do + expect(subject.match('this is #aesthetic')).to_not be_nil + end end describe '.search_for' do |