Merge branch 'master' into feature/donations_btcpay

2024-03-03 12:50:16 +01:00
parent c36cf5eee6 4e8878a4b5
commit e3b96d5cff
13 changed files with 89 additions and 68 deletions
--- a/spec/requests/webfinger_spec.rb
+++ b/spec/requests/webfinger_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe "WebFinger", type: :request do
          res = JSON.parse(response.body)
          rs_link = res["links"].find {|l| l["rel"] == "http://tools.ietf.org/id/draft-dejong-remotestorage"}

-          expect(rs_link["href"]).to eql("https://storage.kosmos.org/tony")
+          expect(rs_link["href"]).to eql("#{Setting.rs_storage_url}/tony")

          oauth_url = rs_link["properties"]["http://tools.ietf.org/html/rfc6749#section-4.2"]
          expect(oauth_url).to eql("http://www.example.com/rs/oauth/tony")