Merge pull request #487 from rainforestapp/RF-22799-allow-empty-fragment-in-custom-url

Allow creation of temporary environment using custom-url containing empty fragment.

Author: philip-maina

runner.go

@@ -437,7 +437,7 @@ func (r *runner) makeRunParams(c cliContext, localTests []*rainforest.RFTest, br
 		}
 
 		var environment *rainforest.Environment
-		environment, err = r.client.CreateTemporaryEnvironment(description, customURL.String(), webhookURL.String())
+		environment, err = r.client.CreateTemporaryEnvironment(description, customURLParam, webhookParam)
 		if err != nil {
 			return rainforest.RunParams{}, err
 		}

runner_test.go

@@ -82,6 +82,9 @@ type fakeRunnerClient struct {
 	mu sync.Mutex
 	// "inherit" from RF API
 	testRfAPI
+
+	temporaryEnvironmentURL     string
+	temporaryEnvironmentWebhook string
 }
 
 func (r *fakeRunnerClient) CheckRunStatus(runID int) (*rainforest.RunStatus, error) {
@@ -117,6 +120,8 @@ func (r *fakeRunnerClient) UpdateTest(t *rainforest.RFTest, branchID int) error
 }
 
 func (r *fakeRunnerClient) CreateTemporaryEnvironment(n string, s string, t string) (*rainforest.Environment, error) {
+	r.temporaryEnvironmentURL = s
+	r.temporaryEnvironmentWebhook = t
 	return &r.environment, nil
 }
 
@@ -219,8 +224,8 @@ func TestMakeRunParams(t *testing.T) {
 		},
 		{
 			mappings: map[string]interface{}{
-				"custom-url": "https://www.rainforestqa.com",
-				"webhook":    "https://www.rainforestqa.com/endpoint",
+				"custom-url": "https://www.rainforestqa.com/foo#",
+				"webhook":    "https://www.rainforestqa.com/endpoint#",
 			},
 			args: cli.Args{},
 			expected: rainforest.RunParams{
@@ -274,9 +279,21 @@ func TestMakeRunParams(t *testing.T) {
 		c := newFakeContext(testCase.mappings, testCase.args)
 		r := newRunner()
 		fakeEnv := rainforest.Environment{ID: fakeEnvID, Name: "the foo environment"}
-		r.client = &fakeRunnerClient{environment: fakeEnv}
+		client := &fakeRunnerClient{environment: fakeEnv}
+		r.client = client
 		res, err := r.makeRunParams(c, nil, 0)
 
+		customURLParam := c.String("custom-url")
+		webhookParam := c.String("webhook")
+
+		if customURLParam != "" && client.temporaryEnvironmentURL != customURLParam {
+			t.Errorf("Expected to call CreateTemporaryEnvironment with url %#v instead got %#v", customURLParam, client.temporaryEnvironmentURL)
+		}
+
+		if webhookParam != "" && client.temporaryEnvironmentWebhook != webhookParam {
+			t.Errorf("Expected to call CreateTemporaryEnvironment with webhook %#v instead got %#v", webhookParam, client.temporaryEnvironmentWebhook)
+		}
+
 		if err != nil {
 			t.Errorf("Error trying to create params: %v", err)
 		} else if !reflect.DeepEqual(res, testCase.expected) {