fixup! fixup! Add tests for endpoint option

Author: surminus

spec/acceptance/realtime/connection_failures_spec.rb

@@ -930,7 +930,7 @@ def send_disconnect_message
                   original_method.call(*args, &block)
                 end
                 connection.once(:connected) do
-                  host = "#{"#{environment}-" if environment && environment.to_s != 'production'}#{Ably::Realtime::Client::DOMAIN}"
+                  host = "#{environment}.realtime.ably.net"
                   expect(hosts.first).to eql(host)
                   expect(hosts.length).to eql(1)
                   stop_reactor
@@ -1469,13 +1469,13 @@ def kill_connection_transport_and_prevent_valid_resume
       end
 
       context 'with non-production environment' do
-        let(:environment)    { 'sandbox' }
-        let(:expected_host)  { "#{environment}-#{Ably::Realtime::Client::DOMAIN}" }
+        let(:environment)    { 'nonprod:sandbox' }
+        let(:expected_host)  { "sandbox.realtime.ably-nonprod.net" }
         let(:client_options) { timeout_options.merge(environment: environment) }
 
         context ':fallback_hosts_use_default is unset' do
           let(:max_time_in_state_for_tests) { 8 }
-          let(:expected_hosts) { Ably::CUSTOM_ENVIRONMENT_FALLBACKS_SUFFIXES.map { |suffix| "#{environment}#{suffix}" } + [expected_host] }
+          let(:expected_hosts) { Ably::CUSTOM_ENVIRONMENT_FALLBACKS_SUFFIXES.map { |suffix| "#{environment}.#{suffix}" } + [expected_host] }
           let(:fallback_hosts_used) { Array.new }
 
           it 'uses fallback hosts by default' do
@@ -1568,7 +1568,7 @@ def kill_connection_transport_and_prevent_valid_resume
           stub_const 'Ably::FALLBACK_HOSTS', custom_hosts
         end
 
-        let(:expected_host)  { Ably::Realtime::Client::DOMAIN }
+        let(:expected_host)  { 'main.realtime.ably.net' }
         let(:client_options) { timeout_options.merge(environment: nil) }
 
         let(:fallback_hosts_used) { Array.new }

spec/acceptance/rest/client_spec.rb

@@ -139,7 +139,7 @@ def encode64(text)
           let(:client_options)      { default_options.merge(key: api_key, client_id: client_id) }
 
           let!(:get_message_history_stub) do
-            stub_request(:get, "https://#{environment}-#{Ably::Rest::Client::DOMAIN}/channels/#{channel_name}/messages?#{history_querystring}")
+            stub_request(:get, "https://#{client.hostname}/channels/#{channel_name}/messages?#{history_querystring}")
               .with(headers: { 'X-Ably-ClientId' => encode64(client_id) })
               .to_return(body: [], headers: { 'Content-Type' => 'application/json' })
           end
@@ -155,7 +155,7 @@ def encode64(text)
           let(:client_options) { default_options.merge(token: token_string) }
 
           let!(:get_message_history_stub) do
-            stub_request(:get, "#{http_protocol}://#{environment}-#{Ably::Rest::Client::DOMAIN}/channels/#{channel_name}/messages?#{history_querystring}").
+            stub_request(:get, "#{http_protocol}://#{client.hostname}/channels/#{channel_name}/messages?#{history_querystring}").
               with(headers: { 'Authorization' => "Bearer #{encode64(token_string)}" }).
               to_return(body: [], headers: { 'Content-Type' => 'application/json' })
           end
@@ -312,9 +312,9 @@ def encode64(text)
 
       context 'when environment is NOT production (#RSC15b)' do
         context 'and custom fallback hosts are empty' do
-          let(:client_options) { default_options.merge(environment: 'sandbox', key: api_key, fallback_hosts: []) }
+          let(:client_options) { default_options.merge(environment: 'nonprod:sandbox', key: api_key, fallback_hosts: []) }
           let!(:default_host_request_stub) do
-            stub_request(:post, "https://#{environment}-#{Ably::Rest::Client::DOMAIN}#{path}").to_return do
+            stub_request(:post, "https://#{client.hostname}#{path}").to_return do
               raise Faraday::TimeoutError.new('timeout error message')
             end
           end
@@ -325,7 +325,7 @@ def encode64(text)
         end
 
         context 'and no custom fallback hosts are provided' do
-          let(:client_options) { default_options.merge(environment: 'sandbox', key: api_key) }
+          let(:client_options) { default_options.merge(environment: 'nonprod:sandbox', key: api_key) }
 
           it 'should make connection attempts to sandbox.a.fallback.ably-realtime.com, sandbox.b.fallback.ably-realtime.com, sandbox.c.fallback.ably-realtime.com, sandbox.d.fallback.ably-realtime.com, sandbox.e.fallback.ably-realtime.com (#RSC15a)' do
             hosts = []
@@ -338,7 +338,7 @@ def encode64(text)
       end
 
       context 'when environment is production' do
-        let(:custom_hosts)       { %w(a.ably-realtime.com b.ably-realtime.com) }
+        let(:custom_hosts)       { %w(main.a.fallback.ably-realtime.com main.b.fallback.ably-realtime.com) }
         let(:max_retry_count)    { 2 }
         let(:max_retry_duration) { 0.5 }
         let(:fallback_block)     { proc { raise Faraday::SSLError.new('ssl error message') } }
@@ -366,7 +366,7 @@ def encode64(text)
 
         context 'and connection times out' do
           let!(:default_host_request_stub) do
-            stub_request(:post, "https://#{Ably::Rest::Client::DOMAIN}#{path}").to_return do
+            stub_request(:post, "https://#{client.hostname}#{path}").to_return do
               raise Faraday::TimeoutError.new('timeout error message')
             end
           end
@@ -380,7 +380,7 @@ def encode64(text)
 
           context "and the total request time exeeds #{http_defaults.fetch(:max_retry_duration)} seconds" do
             let!(:default_host_request_stub) do
-              stub_request(:post, "https://#{Ably::Rest::Client::DOMAIN}#{path}").to_return do
+              stub_request(:post, "https://#{client.hostname}#{path}").to_return do
                 sleep max_retry_duration * 1.5
                 raise Faraday::TimeoutError.new('timeout error message')
               end
@@ -397,7 +397,7 @@ def encode64(text)
 
         context 'and connection fails' do
           let!(:default_host_request_stub) do
-            stub_request(:post, "https://#{Ably::Rest::Client::DOMAIN}#{path}").to_return do
+            stub_request(:post, "https://#{client.hostname}#{path}").to_return do
               raise Faraday::ConnectionFailed.new('connection failure error message')
             end
           end
@@ -422,7 +422,7 @@ def encode64(text)
           end
           let(:requests) { [] }
           let!(:default_host_request_stub) do
-            stub_request(:post, "https://#{Ably::Rest::Client::DOMAIN}#{path}").to_return do
+            stub_request(:post, "https://#{client.hostname}#{path}").to_return do
               requests << true
               if requests.count == 1
                 raise Faraday::ConnectionFailed.new('connection failure error message')
@@ -450,7 +450,7 @@ def encode64(text)
         context 'and basic authentication fails' do
           let(:status) { 401 }
           let!(:default_host_request_stub) do
-            stub_request(:post, "https://#{Ably::Rest::Client::DOMAIN}#{path}").to_return(
+            stub_request(:post, "https://#{client.hostname}#{path}").to_return(
               headers: { 'Content-Type' => 'application/json' },
               status: status,
               body: {
@@ -482,7 +482,7 @@ def encode64(text)
             end
           end
           let!(:default_host_request_stub) do
-            stub_request(:post, "https://#{Ably::Rest::Client::DOMAIN}#{path}").to_return(&fallback_block)
+            stub_request(:post, "https://#{client.hostname}#{path}").to_return(&fallback_block)
           end
 
           it 'attempts the fallback hosts as this is an authentication failure (#RSC15d)' do
@@ -518,7 +518,7 @@ def encode64(text)
           end
         end
         let!(:default_host_request_stub) do
-          stub_request(:post, "https://#{Ably::Rest::Client::DOMAIN}#{path}").to_return(&fallback_block)
+          stub_request(:post, "https://#{client.hostname}#{path}").to_return(&fallback_block)
         end
 
         context 'with custom fallback hosts provided' do
@@ -555,7 +555,7 @@ def encode64(text)
 
         context 'using a local web-server', webmock: false do
           let(:primary_host) { 'local.realtime.ably.net' }
-          let(:fallbacks) { ['local.ably.net', 'localhost'] }
+          let(:fallbacks) { ['localhost.ably.net', 'localhost'] }
           let(:port) { rand(10000) + 2000 }
           let(:channel_name) { 'foo' }
           let(:request_timeout) { 3 }
@@ -863,7 +863,7 @@ def encode64(text)
           end
         end
         let!(:default_host_request_stub) do
-          stub_request(:post, "https://#{env}-#{Ably::Rest::Client::DOMAIN}#{path}").to_return(&fallback_block)
+          stub_request(:post, "https://#{client.hostname}#{path}").to_return(&fallback_block)
         end
 
         context 'with no fallback hosts provided (#TBC, see https://github.com/ably/wiki/issues/361)' do
@@ -1374,7 +1374,7 @@ def encode64(text)
         let(:client_options) do
           default_options.merge(
             rest_host: 'non.existent.domain.local',
-            fallback_hosts: [[environment, Ably::Rest::Client::DOMAIN].join('-')],
+            fallback_hosts: ["sandbox.realtime.ably-nonprod.net"],
             key: api_key,
             logger: custom_logger,
             log_retries_as_info: false)

spec/shared/client_initializer_behaviour.rb

@@ -164,10 +164,10 @@ def rest?
       end
 
       context 'with environment option' do
-        let(:client_options) { default_options.merge(environment: 'sandbox', auto_connect: false) }
+        let(:client_options) { default_options.merge(environment: 'nonprod:sandbox', auto_connect: false) }
 
         it 'uses an alternate uri' do
-          expect(subject.uri.to_s).to eql("#{protocol}s://sandbox.realtime.ably.net")
+          expect(subject.uri.to_s).to eql("#{protocol}s://sandbox.realtime.ably-nonprod.net")
         end
       end