From a34b767aa585cdaef61b6516cd7e051e842c3add Mon Sep 17 00:00:00 2001
From: Luke Kysow <1034429+lkysow@users.noreply.github.com>
Date: Wed, 27 Nov 2019 09:17:32 -0800
Subject: [PATCH] Test when force_remove_source_branch is bool

---
 .../testdata/gitlab-merge-request-comment-event-subgroup.json | 4 ++--
 .../events/testdata/gitlab-merge-request-event-subgroup.json  | 4 ++--
 server/events/testdata/gitlab-merge-request-event.json        | 4 ++--
 server/gitlab_request_parser_validator_test.go                | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/server/events/testdata/gitlab-merge-request-comment-event-subgroup.json b/server/events/testdata/gitlab-merge-request-comment-event-subgroup.json
index 63272ef58..bb3162607 100644
--- a/server/events/testdata/gitlab-merge-request-comment-event-subgroup.json
+++ b/server/events/testdata/gitlab-merge-request-comment-event-subgroup.json
@@ -70,7 +70,7 @@
     "merge_commit_sha": null,
     "merge_error": null,
     "merge_params": {
-      "force_remove_source_branch": "0"
+      "force_remove_source_branch": false
     },
     "merge_status": "can_be_merged",
     "merge_user_id": null,
@@ -137,4 +137,4 @@
     "human_total_time_spent": null,
     "human_time_estimate": null
   }
-}
\ No newline at end of file
+}
diff --git a/server/events/testdata/gitlab-merge-request-event-subgroup.json b/server/events/testdata/gitlab-merge-request-event-subgroup.json
index 80059c1f2..9b768471a 100644
--- a/server/events/testdata/gitlab-merge-request-event-subgroup.json
+++ b/server/events/testdata/gitlab-merge-request-event-subgroup.json
@@ -37,7 +37,7 @@
     "merge_commit_sha": null,
     "merge_error": null,
     "merge_params": {
-      "force_remove_source_branch": "0"
+      "force_remove_source_branch": false
     },
     "merge_status": "unchecked",
     "merge_user_id": null,
@@ -120,4 +120,4 @@
     "description": "",
     "homepage": "https://gitlab.com/lkysow-test/subgroup/sub-subgroup/atlantis-example"
   }
-}
\ No newline at end of file
+}
diff --git a/server/events/testdata/gitlab-merge-request-event.json b/server/events/testdata/gitlab-merge-request-event.json
index 25725470f..8c27cfd34 100644
--- a/server/events/testdata/gitlab-merge-request-event.json
+++ b/server/events/testdata/gitlab-merge-request-event.json
@@ -37,7 +37,7 @@
     "merge_commit_sha": null,
     "merge_error": null,
     "merge_params": {
-      "force_remove_source_branch": "0"
+      "force_remove_source_branch": false
     },
     "merge_status": "unchecked",
     "merge_user_id": null,
@@ -133,7 +133,7 @@
       "previous": {
       },
       "current": {
-        "force_remove_source_branch": "0"
+        "force_remove_source_branch": false
       }
     },
     "source_branch": {
diff --git a/server/gitlab_request_parser_validator_test.go b/server/gitlab_request_parser_validator_test.go
index 74a847212..a0759b606 100644
--- a/server/gitlab_request_parser_validator_test.go
+++ b/server/gitlab_request_parser_validator_test.go
@@ -177,7 +177,7 @@ var mergeEventJSON = `{
     "merge_commit_sha": null,
     "merge_error": null,
     "merge_params": {
-      "force_remove_source_branch": "0"
+      "force_remove_source_branch": false
     },
     "merge_status": "unchecked",
     "merge_user_id": null,
@@ -273,7 +273,7 @@ var mergeEventJSON = `{
       "previous": {
       },
       "current": {
-        "force_remove_source_branch": "0"
+        "force_remove_source_branch": false
       }
     },
     "source_branch": {