Fix most rubocop issues (#2165)
* Run rubocop --autocorrect on app/, config/ and lib/, also manually fix some remaining style issues * Run rubocop --autocorrect-all on db/ * Run rubocop --autocorrect-all on `spec/` and fix remaining issues
This commit is contained in:
@@ -1,12 +1,14 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
require 'rails_helper'
|
||||
|
||||
RSpec.describe AdvancedTextFormatter do
|
||||
describe '#to_s' do
|
||||
subject { described_class.new(text, preloaded_accounts: preloaded_accounts, content_type: content_type).to_s }
|
||||
|
||||
let(:preloaded_accounts) { nil }
|
||||
let(:content_type) { 'text/markdown' }
|
||||
|
||||
subject { described_class.new(text, preloaded_accounts: preloaded_accounts, content_type: content_type).to_s }
|
||||
|
||||
context 'given a markdown source' do
|
||||
let(:content_type) { 'text/markdown' }
|
||||
|
||||
@@ -14,7 +16,7 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { 'text' }
|
||||
|
||||
it 'paragraphizes the text' do
|
||||
is_expected.to eq '<p>text</p>'
|
||||
expect(subject).to eq '<p>text</p>'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -22,7 +24,7 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { "line\nfeed" }
|
||||
|
||||
it 'removes line feeds' do
|
||||
is_expected.not_to include "\n"
|
||||
expect(subject).to_not include "\n"
|
||||
end
|
||||
end
|
||||
|
||||
@@ -30,7 +32,7 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { 'test `foo` bar' }
|
||||
|
||||
it 'formats code using <code>' do
|
||||
is_expected.to include 'test <code>foo</code> bar'
|
||||
expect(subject).to include 'test <code>foo</code> bar'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -38,15 +40,15 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { "test\n\n```\nint main(void) {\n return 0; // https://joinmastodon.org/foo\n}\n```\n" }
|
||||
|
||||
it 'formats code using <pre> and <code>' do
|
||||
is_expected.to include '<pre><code>int main'
|
||||
expect(subject).to include '<pre><code>int main'
|
||||
end
|
||||
|
||||
it 'does not strip leading spaces' do
|
||||
is_expected.to include '> return 0'
|
||||
expect(subject).to include '> return 0'
|
||||
end
|
||||
|
||||
it 'does not format links' do
|
||||
is_expected.to include 'return 0; // https://joinmastodon.org/foo'
|
||||
expect(subject).to include 'return 0; // https://joinmastodon.org/foo'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -54,7 +56,7 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { 'test `https://foo.bar/bar` bar' }
|
||||
|
||||
it 'does not rewrite the link' do
|
||||
is_expected.to include 'test <code>https://foo.bar/bar</code> bar'
|
||||
expect(subject).to include 'test <code>https://foo.bar/bar</code> bar'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -62,7 +64,7 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { 'foo https://cb6e6126.ngrok.io/about/more' }
|
||||
|
||||
it 'creates a link' do
|
||||
is_expected.to include '<a href="https://cb6e6126.ngrok.io/about/more"'
|
||||
expect(subject).to include '<a href="https://cb6e6126.ngrok.io/about/more"'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -71,7 +73,7 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { '@alice' }
|
||||
|
||||
it 'creates a mention link' do
|
||||
is_expected.to include '<a href="https://cb6e6126.ngrok.io/@alice" class="u-url mention">@<span>alice</span></a></span>'
|
||||
expect(subject).to include '<a href="https://cb6e6126.ngrok.io/@alice" class="u-url mention">@<span>alice</span></a></span>'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -80,7 +82,7 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { '@alice' }
|
||||
|
||||
it 'does not create a mention link' do
|
||||
is_expected.to include '@alice'
|
||||
expect(subject).to include '@alice'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -88,7 +90,7 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { 'https://hackernoon.com/the-power-to-build-communities-a-response-to-mark-zuckerberg-3f2cac9148a4' }
|
||||
|
||||
it 'matches the full URL' do
|
||||
is_expected.to include 'href="https://hackernoon.com/the-power-to-build-communities-a-response-to-mark-zuckerberg-3f2cac9148a4"'
|
||||
expect(subject).to include 'href="https://hackernoon.com/the-power-to-build-communities-a-response-to-mark-zuckerberg-3f2cac9148a4"'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -96,7 +98,7 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { 'http://google.com' }
|
||||
|
||||
it 'matches the full URL' do
|
||||
is_expected.to include 'href="http://google.com"'
|
||||
expect(subject).to include 'href="http://google.com"'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -104,7 +106,7 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { 'http://example.gay' }
|
||||
|
||||
it 'matches the full URL' do
|
||||
is_expected.to include 'href="http://example.gay"'
|
||||
expect(subject).to include 'href="http://example.gay"'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -112,11 +114,11 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { 'https://nic.みんな/' }
|
||||
|
||||
it 'matches the full URL' do
|
||||
is_expected.to include 'href="https://nic.みんな/"'
|
||||
expect(subject).to include 'href="https://nic.みんな/"'
|
||||
end
|
||||
|
||||
it 'has display URL' do
|
||||
is_expected.to include '<span class="">nic.みんな/</span>'
|
||||
expect(subject).to include '<span class="">nic.みんな/</span>'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -124,7 +126,7 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { 'http://www.mcmansionhell.com/post/156408871451/50-states-of-mcmansion-hell-scottsdale-arizona. ' }
|
||||
|
||||
it 'matches the full URL but not the period' do
|
||||
is_expected.to include 'href="http://www.mcmansionhell.com/post/156408871451/50-states-of-mcmansion-hell-scottsdale-arizona"'
|
||||
expect(subject).to include 'href="http://www.mcmansionhell.com/post/156408871451/50-states-of-mcmansion-hell-scottsdale-arizona"'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -132,7 +134,7 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { '(http://google.com/)' }
|
||||
|
||||
it 'matches the full URL but not the parentheses' do
|
||||
is_expected.to include 'href="http://google.com/"'
|
||||
expect(subject).to include 'href="http://google.com/"'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -140,7 +142,7 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { 'http://www.google.com!' }
|
||||
|
||||
it 'matches the full URL but not the exclamation point' do
|
||||
is_expected.to include 'href="http://www.google.com"'
|
||||
expect(subject).to include 'href="http://www.google.com"'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -148,7 +150,7 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { "http://www.google.com'" }
|
||||
|
||||
it 'matches the full URL but not the single quote' do
|
||||
is_expected.to include 'href="http://www.google.com"'
|
||||
expect(subject).to include 'href="http://www.google.com"'
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -157,7 +159,7 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { 'http://www.google.com>' }
|
||||
|
||||
it 'matches the full URL but not the angle bracket' do
|
||||
is_expected.to include 'href="http://www.google.com"'
|
||||
expect(subject).to include 'href="http://www.google.com"'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -166,7 +168,7 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { 'https://www.ruby-toolbox.com/search?utf8=%E2%9C%93&q=autolink' }
|
||||
|
||||
it 'matches the full URL' do
|
||||
is_expected.to include 'href="https://www.ruby-toolbox.com/search?utf8=%E2%9C%93&q=autolink"'
|
||||
expect(subject).to include 'href="https://www.ruby-toolbox.com/search?utf8=%E2%9C%93&q=autolink"'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -174,7 +176,7 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { 'https://www.ruby-toolbox.com/search?utf8=✓&q=autolink' }
|
||||
|
||||
it 'matches the full URL' do
|
||||
is_expected.to include 'href="https://www.ruby-toolbox.com/search?utf8=✓&q=autolink"'
|
||||
expect(subject).to include 'href="https://www.ruby-toolbox.com/search?utf8=✓&q=autolink"'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -182,7 +184,7 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { 'https://www.ruby-toolbox.com/search?utf8=✓' }
|
||||
|
||||
it 'matches the full URL' do
|
||||
is_expected.to include 'href="https://www.ruby-toolbox.com/search?utf8=✓"'
|
||||
expect(subject).to include 'href="https://www.ruby-toolbox.com/search?utf8=✓"'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -190,7 +192,7 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { 'https://www.ruby-toolbox.com/search?utf8=%E2%9C%93&utf81=✓&q=autolink' }
|
||||
|
||||
it 'preserves escaped unicode characters' do
|
||||
is_expected.to include 'href="https://www.ruby-toolbox.com/search?utf8=%E2%9C%93&utf81=✓&q=autolink"'
|
||||
expect(subject).to include 'href="https://www.ruby-toolbox.com/search?utf8=%E2%9C%93&utf81=✓&q=autolink"'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -198,7 +200,7 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { 'https://en.wikipedia.org/wiki/Diaspora_(software)' }
|
||||
|
||||
it 'matches the full URL' do
|
||||
is_expected.to include 'href="https://en.wikipedia.org/wiki/Diaspora_(software)"'
|
||||
expect(subject).to include 'href="https://en.wikipedia.org/wiki/Diaspora_(software)"'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -206,7 +208,7 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { '"https://example.com/"' }
|
||||
|
||||
it 'does not match the quotation marks' do
|
||||
is_expected.to include 'href="https://example.com/"'
|
||||
expect(subject).to include 'href="https://example.com/"'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -214,19 +216,19 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { '<https://example.com/>' }
|
||||
|
||||
it 'does not match the angle brackets' do
|
||||
is_expected.to include 'href="https://example.com/"'
|
||||
expect(subject).to include 'href="https://example.com/"'
|
||||
end
|
||||
end
|
||||
|
||||
context 'given a URL containing unsafe code (XSS attack, invisible part)' do
|
||||
let(:text) { %q{http://example.com/blahblahblahblah/a<script>alert("Hello")</script>} }
|
||||
let(:text) { 'http://example.com/blahblahblahblah/a<script>alert("Hello")</script>' }
|
||||
|
||||
it 'does not include the HTML in the URL' do
|
||||
is_expected.to include '"http://example.com/blahblahblahblah/a"'
|
||||
expect(subject).to include '"http://example.com/blahblahblahblah/a"'
|
||||
end
|
||||
|
||||
it 'does not include a script tag' do
|
||||
is_expected.to_not include '<script>'
|
||||
expect(subject).to_not include '<script>'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -234,7 +236,7 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { '<script>alert("Hello")</script>' }
|
||||
|
||||
it 'does not include a script tag' do
|
||||
is_expected.to_not include '<script>'
|
||||
expect(subject).to_not include '<script>'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -242,7 +244,7 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { %q{<img src="javascript:alert('XSS');">} }
|
||||
|
||||
it 'does not include the javascript' do
|
||||
is_expected.to_not include 'href="javascript:'
|
||||
expect(subject).to_not include 'href="javascript:'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -250,7 +252,7 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { 'http://www\.google\.com' }
|
||||
|
||||
it 'outputs the raw URL' do
|
||||
is_expected.to eq '<p>http://www\.google\.com</p>'
|
||||
expect(subject).to eq '<p>http://www\.google\.com</p>'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -258,7 +260,7 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { '#hashtag' }
|
||||
|
||||
it 'creates a hashtag link' do
|
||||
is_expected.to include '/tags/hashtag" class="mention hashtag" rel="tag">#<span>hashtag</span></a>'
|
||||
expect(subject).to include '/tags/hashtag" class="mention hashtag" rel="tag">#<span>hashtag</span></a>'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -266,7 +268,7 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { '#hashtagタグ' }
|
||||
|
||||
it 'creates a hashtag link' do
|
||||
is_expected.to include '/tags/hashtag%E3%82%BF%E3%82%B0" class="mention hashtag" rel="tag">#<span>hashtagタグ</span></a>'
|
||||
expect(subject).to include '/tags/hashtag%E3%82%BF%E3%82%B0" class="mention hashtag" rel="tag">#<span>hashtagタグ</span></a>'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -274,7 +276,7 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { 'xmpp:user@instance.com' }
|
||||
|
||||
it 'matches the full URI' do
|
||||
is_expected.to include 'href="xmpp:user@instance.com"'
|
||||
expect(subject).to include 'href="xmpp:user@instance.com"'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -282,7 +284,7 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { 'please join xmpp:muc@instance.com?join right now' }
|
||||
|
||||
it 'matches the full URI' do
|
||||
is_expected.to include 'href="xmpp:muc@instance.com?join"'
|
||||
expect(subject).to include 'href="xmpp:muc@instance.com?join"'
|
||||
end
|
||||
end
|
||||
|
||||
@@ -290,7 +292,7 @@ RSpec.describe AdvancedTextFormatter do
|
||||
let(:text) { 'wikipedia gives this example of a magnet uri: magnet:?xt=urn:btih:c12fe1c06bba254a9dc9f519b335aa7c1367a88a' }
|
||||
|
||||
it 'matches the full URI' do
|
||||
is_expected.to include 'href="magnet:?xt=urn:btih:c12fe1c06bba254a9dc9f519b335aa7c1367a88a"'
|
||||
expect(subject).to include 'href="magnet:?xt=urn:btih:c12fe1c06bba254a9dc9f519b335aa7c1367a88a"'
|
||||
end
|
||||
end
|
||||
end
|
||||
|
Reference in New Issue
Block a user