about summary refs log tree commit diff
path: root/spec/models
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-12-06 17:40:43 +0100
committerGitHub <noreply@github.com>2018-12-06 17:40:43 +0100
commite3682c9c1750e5e7e5d2f817e29f6760a18400ca (patch)
tree1fb5c57e634a16136e764178e2e1ca1d0e009a25 /spec/models
parent4167ed375bd9402e91a998fad8f173fa76b2eec3 (diff)
parent24822eca73ac2bc37870bd27cae8ee6b17785759 (diff)
Merge pull request #848 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/identity_spec.rb13
-rw-r--r--spec/models/notification_spec.rb4
2 files changed, 12 insertions, 5 deletions
diff --git a/spec/models/identity_spec.rb b/spec/models/identity_spec.rb
index 53f355410..689c9b797 100644
--- a/spec/models/identity_spec.rb
+++ b/spec/models/identity_spec.rb
@@ -1,5 +1,16 @@
 require 'rails_helper'
 
 RSpec.describe Identity, type: :model do
-  pending "add some examples to (or delete) #{__FILE__}"
+  describe '.find_for_oauth' do
+    let(:auth) { Fabricate(:identity, user: Fabricate(:user)) }
+
+    it 'calls .find_or_create_by' do
+      expect(described_class).to receive(:find_or_create_by).with(uid: auth.uid, provider: auth.provider)
+      described_class.find_for_oauth(auth)
+    end
+
+    it 'returns an instance of Identity' do
+      expect(described_class.find_for_oauth(auth)).to be_instance_of Identity
+    end
+  end
 end
diff --git a/spec/models/notification_spec.rb b/spec/models/notification_spec.rb
index 403eb8c33..59c582cde 100644
--- a/spec/models/notification_spec.rb
+++ b/spec/models/notification_spec.rb
@@ -1,10 +1,6 @@
 require 'rails_helper'
 
 RSpec.describe Notification, type: :model do
-  describe '#from_account' do
-    pending
-  end
-
   describe '#target_status' do
     let(:notification) { Fabricate(:notification, activity: activity) }
     let(:status)       { Fabricate(:status) }