Skip to content

Commit

Permalink
Merge pull request #200 from ably/feature/rename-master-to-main
Browse files Browse the repository at this point in the history
Rename master to main
  • Loading branch information
Quintin committed Jul 23, 2020
2 parents d62ed0a + a0b5bc3 commit 65ad0d8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions lib/ably/exceptions.rb
Expand Up @@ -5,7 +5,7 @@ module Exceptions
TOKEN_EXPIRED_CODE = 40140..40149

# Base Ably exception class that contains status and code values used by Ably
# Refer to https://github.com/ably/ably-common/blob/master/protocol/errors.json
# Refer to https://github.com/ably/ably-common/blob/main/protocol/errors.json
#
# @!attribute [r] message
# @return [String] Error message from Ably
Expand Down Expand Up @@ -116,7 +116,7 @@ class InvalidStateChange < BaseAblyException; end
class InvalidState < BaseAblyException; end

# A generic Ably exception taht supports a status & code.
# See https://github.com/ably/ably-common/blob/master/protocol/errors.json for a list of Ably errors
# See https://github.com/ably/ably-common/blob/main/protocol/errors.json for a list of Ably errors
class Standard < BaseAblyException; end

# The HTTP request has returned a 500 error
Expand Down
4 changes: 2 additions & 2 deletions spec/support/test_app.rb
Expand Up @@ -4,11 +4,11 @@ class TestApp
TEST_RESOURCES_PATH = File.expand_path('../../../lib/submodules/ably-common/test-resources', __FILE__)

# App configuration for test app
# See https://github.com/ably/ably-common/blob/master/test-resources/test-app-setup.json
# See https://github.com/ably/ably-common/blob/main/test-resources/test-app-setup.json
APP_SPEC = JSON.parse(File.read(File.join(TEST_RESOURCES_PATH, 'test-app-setup.json')))['post_apps']

# Cipher details used for client_encoded presence data in test app
# See https://github.com/ably/ably-common/blob/master/test-resources/test-app-setup.json
# See https://github.com/ably/ably-common/blob/main/test-resources/test-app-setup.json
APP_SPEC_CIPHER = JSON.parse(File.read(File.join(TEST_RESOURCES_PATH, 'test-app-setup.json')))['cipher']

# If an app has already been created and we need a new app, create a new test app
Expand Down

0 comments on commit 65ad0d8

Please sign in to comment.