Merge that good fresh upstream shit

2 files changed, 16 insertions, 1 deletions

diff --git a/spec/lib/emoji_spec.rb b/spec/lib/emoji_spec.rb
new file mode 100644
index 000000000..04931ccfb
--- /dev/null
+++ b/spec/lib/emoji_spec.rb
@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+RSpec.describe Emoji do
+  describe '#unicode' do
+    it 'returns a unicode for a shortcode' do
+      expect(Emoji.instance.unicode(':joy:')).to eq '😂'
+    end
+  end
+
+  describe '#names' do
+    it 'returns an array' do
+      expect(Emoji.instance.names).to be_an Array
+    end
+  end
+end
diff --git a/spec/services/resolve_remote_account_service_spec.rb b/spec/services/resolve_remote_account_service_spec.rb
index ab5d3c6e5..c3b902b34 100644
--- a/spec/services/resolve_remote_account_service_spec.rb
+++ b/spec/services/resolve_remote_account_service_spec.rb
@@ -78,7 +78,7 @@ RSpec.describe ResolveRemoteAccountService do
       Thread.new do
         true while wait_for_start
         begin
-          return_values << subject.call('foo@localdomain.com')
+          return_values << ResolveRemoteAccountService.new.call('foo@localdomain.com')
         rescue ActiveRecord::RecordNotUnique
           fail_occurred = true
         end