Merge branch 'master' of https://github.com/CDL-Dryad/dryad into peer…

…-review
CDL-Dryad · Jun 17, 2019 · 247edff · 247edff
2 parents 22fd1f8 + 713f0a6
commit 247edff
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 18 deletions.
diff --git a/public/images/logo_ucla.svg b/public/images/logo_ucla.svg
diff --git a/spec/mocks/ror.rb b/spec/mocks/ror.rb
@@ -3,10 +3,23 @@ module Mocks
   module Ror
 
     def mock_ror!(user = nil)
+      stub_ror_heartbeat_check
       stub_ror_name_lookup(name: user.present? && user.affiliation.present? ? user.affiliation.long_name : nil)
       stub_ror_id_lookup(university: user.present? && user.affiliation.present? ? user.affiliation.long_name : nil)
     end
 
+    def stub_ror_heartbeat_check
+      stub_request(:get, 'https://api.ror.org/heartbeat')
+        .with(
+          headers: {
+            'Accept' => '*/*',
+            'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+            'User-Agent' => 'Ruby'
+          }
+        )
+        .to_return(status: 200, body: '', headers: {})
+    end
+
     # rubocop:disable Metrics/MethodLength
     def stub_ror_id_lookup(university: Faker::Educator.university, country: 'United States of America')
       # Mock a request for a specific ROR Organization