Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- .eslintrc.yml
  Removed, as upstream removed it.
- app/controllers/admin/statuses_controller.rb
  Minor code cleanup when porting one of our features.
- app/models/account.rb
  Note length validation has changed upstream.
  We now use upstream's validation (dropped legacy glitch-soc
  account metadata stuff) but with configurable limit.
- app/services/post_status_service.rb
  Upstream has added support for scheduled toots, refactoring
  the code a bit. Adapted our changes to this refactoring.
- app/views/stream_entries/_detailed_status.html.haml
  Not a real conflict, changes too close.
- app/views/stream_entries/_simple_status.html.haml
  Not a real conflict, changes too close.

2 files changed, 78 insertions, 0 deletions

diff --git a/spec/validators/unreserved_username_validator_spec.rb b/spec/validators/unreserved_username_validator_spec.rb
new file mode 100644
index 000000000..0187941b0
--- /dev/null
+++ b/spec/validators/unreserved_username_validator_spec.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe UnreservedUsernameValidator, type: :validator do
+  describe '#validate' do
+    before do
+      allow(validator).to receive(:reserved_username?) { reserved_username }
+      validator.validate(account)
+    end
+
+    let(:validator) { described_class.new }
+    let(:account)   { double(username: username, errors: errors) }
+    let(:errors )   { double(add: nil) }
+
+    context '@username.nil?' do
+      let(:username)  { nil }
+
+      it 'not calls errors.add' do
+        expect(errors).not_to have_received(:add).with(:username, any_args)
+      end
+    end
+
+    context '!@username.nil?' do
+      let(:username)  { '' }
+
+      context 'reserved_username?' do
+        let(:reserved_username) { true }
+
+        it 'calls erros.add' do
+          expect(errors).to have_received(:add).with(:username, I18n.t('accounts.reserved_username'))
+        end
+      end
+
+      context '!reserved_username?' do
+        let(:reserved_username) { false }
+
+        it 'not calls erros.add' do
+          expect(errors).not_to have_received(:add).with(:username, any_args)
+        end
+      end
+    end
+  end
+end
diff --git a/spec/validators/url_validator_spec.rb b/spec/validators/url_validator_spec.rb
new file mode 100644
index 000000000..e8d0e6494
--- /dev/null
+++ b/spec/validators/url_validator_spec.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe UrlValidator, type: :validator do
+  describe '#validate_each' do
+    before do
+      allow(validator).to receive(:compliant?).with(value) { compliant }
+      validator.validate_each(record, attribute, value)
+    end
+
+    let(:validator) { described_class.new(attributes: [attribute]) }
+    let(:record)    { double(errors: errors) }
+    let(:errors)    { double(add: nil) }
+    let(:value)     { '' }
+    let(:attribute) { :foo }
+
+    context 'unless compliant?' do
+      let(:compliant) { false }
+
+      it 'calls errors.add' do
+        expect(errors).to have_received(:add).with(attribute, I18n.t('applications.invalid_url'))
+      end
+    end
+
+    context 'if compliant?' do
+      let(:compliant) { true }
+
+      it 'not calls errors.add' do
+        expect(errors).not_to have_received(:add).with(attribute, any_args)
+      end
+    end
+  end
+end