Fix REST pagination URL

virtualq · Aug 20, 2019 · c9d43e3 · c9d43e3
1 parent 0da31a0
commit c9d43e3
Show file tree

Hide file tree

Showing 16 changed files with 33 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 ## [Unreleased]
 ### Fixed
 - Restore the correct parameter for the REST client space URL
+- Fix REST pagination URL
 ### Changed
 - SDK now uses `signalwire.receive` to set up contexts
 

diff --git a/lib/signalwire/sdk/twilio_set_fax.rb b/lib/signalwire/sdk/twilio_set_fax.rb
@@ -12,7 +12,7 @@ def initialize(twilio)
                       'SignalWire Space URL is not configured. Enter your SignalWire Space domain via the '\
                       'SIGNALWIRE_HOST environment variable, or hostname in the configuration.')
 
-        @base_url = "https://#{@host}/api/laml"
+        @base_url = "https://#{@host}"
         @port = 443
 
         # Versions

diff --git a/lib/signalwire/sdk/twilio_set_host.rb b/lib/signalwire/sdk/twilio_set_host.rb
@@ -14,7 +14,7 @@ def initialize(twilio)
                       'SIGNALWIRE_HOST or SIGNALWIRE_API_HOSTNAME environment variables, '\
                       'or hostname in the configuration.')
 
-        @base_url = "https://#{@host}/api/laml"
+        @base_url = "https://#{@host}"
         @port = 443
 
         # Versions

diff --git a/spec/signalwire/rest/client_spec.rb b/spec/signalwire/rest/client_spec.rb
@@ -12,7 +12,7 @@ module Signalwire
       @client = Signalwire::REST::Client.new 'MYSWPROJECT',
                                              'MYSWTOKEN'
 
-      stub = stub_request(:post, 'https://myswspace.signalwire.com/api/laml/2010-04-01/Accounts/MYSWPROJECT/Messages.json')
+      stub = stub_request(:post, 'https://myswspace.signalwire.com/2010-04-01/Accounts/MYSWPROJECT/Messages.json')
              .with(body: { 'Body' => 'This is a message from the Signalwire-Ruby library!',
                            'From' => '+15556677999', 'To' => '+15558866555' })
 

diff --git a/spec/signalwire/rest/integration_spec.rb b/spec/signalwire/rest/integration_spec.rb
@@ -95,7 +95,7 @@
       VCR.use_cassette('get_fax_media_instance') do
         fax_media = @client.fax.faxes('831455c6-574e-4d8b-b6ee-2418140bf4cd').media('aff0684c-3445-49bc-802b-3a0a488139f5').fetch
         expect(fax_media.content_type).to eq 'image/tiff'
-        expect(fax_media.url).to eq '/api/laml/2010-04-01/Accounts/xyz123-xyz123-xyz123/Faxes/831455c6-574e-4d8b-b6ee-2418140bf4cd/Media/aff0684c-3445-49bc-802b-3a0a488139f5.json'
+        expect(fax_media.url).to eq '/2010-04-01/Accounts/xyz123-xyz123-xyz123/Faxes/831455c6-574e-4d8b-b6ee-2418140bf4cd/Media/aff0684c-3445-49bc-802b-3a0a488139f5.json'
       end
     end
   end

diff --git a/spec/vcr_cassettes/accounts.yml b/spec/vcr_cassettes/accounts.yml
diff --git a/spec/vcr_cassettes/applications.yml b/spec/vcr_cassettes/applications.yml
diff --git a/spec/vcr_cassettes/get_fax.yml b/spec/vcr_cassettes/get_fax.yml
diff --git a/spec/vcr_cassettes/get_fax_media_instance.yml b/spec/vcr_cassettes/get_fax_media_instance.yml
diff --git a/spec/vcr_cassettes/get_fax_media_list.yml b/spec/vcr_cassettes/get_fax_media_list.yml