Removed use of Environment from ablytest and sandbox test utils, updated

tests accordingly

Author: sacOO7

ably/rest_channel_integration_test.go

@@ -142,7 +142,7 @@ func TestRESTChannel(t *testing.T) {
 }
 
 func TestIdempotentPublishing(t *testing.T) {
-	app, err := ablytest.NewSandboxWithEndpoint(nil, ablytest.Endpoint, ablytest.Environment)
+	app, err := ablytest.NewSandboxWithEndpoint(nil, ablytest.Endpoint)
 	assert.NoError(t, err)
 	defer app.Close()
 	options := app.Options(ably.WithIdempotentRESTPublishing(true))
@@ -295,7 +295,7 @@ func TestIdempotentPublishing(t *testing.T) {
 }
 
 func TestIdempotent_retry(t *testing.T) {
-	app, err := ablytest.NewSandboxWithEndpoint(nil, ablytest.Endpoint, ablytest.Environment)
+	app, err := ablytest.NewSandboxWithEndpoint(nil, ablytest.Endpoint)
 	assert.NoError(t, err)
 	defer app.Close()
 	randomStr, err := ablyutil.BaseID()

ablytest/ablytest.go

@@ -17,7 +17,6 @@ import (
 var Timeout = 30 * time.Second
 var NoBinaryProtocol bool
 var DefaultLogLevel = ably.LogNone
-var Environment = "sandbox"
 var Endpoint = "nonprod:sandbox"
 
 func nonil(err ...error) error {
@@ -41,8 +40,8 @@ func init() {
 	if n, err := strconv.Atoi(os.Getenv("ABLY_LOGLEVEL")); err == nil {
 		DefaultLogLevel = ably.LogLevel(n)
 	}
-	if s := os.Getenv("ABLY_ENV"); s != "" {
-		Environment = s
+	if s := os.Getenv("ABLY_ENDPOINT"); s != "" {
+		Endpoint = s
 	}
 }
 

ablytest/sandbox.go

@@ -105,9 +105,6 @@ type Sandbox struct {
 	// Endpoint is the hostname to connect to
 	Endpoint string
 
-	// Environment is used in auth parameters
-	Environment string
-
 	client *http.Client
 }
 
@@ -138,15 +135,14 @@ func MustSandbox(config *Config) *Sandbox {
 }
 
 func NewSandbox(config *Config) (*Sandbox, error) {
-	return NewSandboxWithEndpoint(config, Endpoint, Environment)
+	return NewSandboxWithEndpoint(config, Endpoint)
 }
 
-func NewSandboxWithEndpoint(config *Config, endpoint, environment string) (*Sandbox, error) {
+func NewSandboxWithEndpoint(config *Config, endpoint string) (*Sandbox, error) {
 	app := &Sandbox{
-		Config:      config,
-		Endpoint:    endpoint,
-		Environment: environment,
-		client:      NewHTTPClient(),
+		Config:   config,
+		Endpoint: endpoint,
+		client:   NewHTTPClient(),
 	}
 	if app.Config == nil {
 		app.Config = DefaultConfig()
@@ -282,7 +278,7 @@ var CREATE_JWT_URL string = "https://echo.ably.io/createJWT"
 func (app *Sandbox) GetJwtAuthParams(expiresIn time.Duration, invalid bool) url.Values {
 	key, secret := app.KeyParts()
 	authParams := url.Values{}
-	authParams.Add("environment", app.Environment)
+	authParams.Add("endpoint", app.Endpoint)
 	authParams.Add("returnType", "jwt")
 	authParams.Add("keyName", key)
 	if invalid {