Merge branch 'v5_staging' into rename-message

epels · epels · commit e31057459cff · 2018-07-25T09:53:47.000+02:00
diff --git a/hlr/testdata/hlrListObject.json b/hlr/testdata/hlrListObject.json
@@ -4,15 +4,15 @@
     "count": 2,
     "totalCount": 2,
     "links": {
-        "first": "https:\/\/rest.messagebird.com\/hlr\/?offset=0",
+        "first": "https://rest.messagebird.com/hlr/?offset=0",
         "previous": null,
         "next": null,
-        "last": "https:\/\/rest.messagebird.com\/hlr\/?offset=0"
+        "last": "https://rest.messagebird.com/hlr/?offset=0"
     },
     "items": [
         {
             "id": "27978c50354a93ca0ca8de6h54340177",
-            "href": "https:\/\/rest.messagebird.com\/hlr\/27978c50354a93ca0ca8de6h54340177",
+            "href": "https://rest.messagebird.com/hlr/27978c50354a93ca0ca8de6h54340177",
             "msisdn": 31612345678,
             "network": 20406,
             "reference": "MyReference",
@@ -22,7 +22,7 @@
         },
         {
             "id": "27978c50354a93ca0ca8de6h54340177",
-            "href": "https:\/\/rest.messagebird.com\/hlr\/27978c50354a93ca0ca8de6h54340177",
+            "href": "https://rest.messagebird.com/hlr/27978c50354a93ca0ca8de6h54340177",
             "msisdn": 31612345678,
             "network": 20406,
             "reference": "MyReference",
diff --git a/hlr/testdata/hlrObject.json b/hlr/testdata/hlrObject.json
@@ -1,6 +1,6 @@
 {
     "id": "27978c50354a93ca0ca8de6h54340177",
-    "href": "https:\/\/rest.messagebird.com\/hlr\/27978c50354a93ca0ca8de6h54340177",
+    "href": "https://rest.messagebird.com/hlr/27978c50354a93ca0ca8de6h54340177",
     "msisdn": 31612345678,
     "network": 20406,
     "reference": "MyReference",
diff --git a/lookup/testdata/lookupObject.json b/lookup/testdata/lookupObject.json
@@ -1,5 +1,5 @@
 {
-    "href": "https:\/\/rest.messagebird.com\/lookup\/31624971134",
+    "href": "https://rest.messagebird.com/lookup/31624971134",
     "countryCode": "NL",
     "countryPrefix": 31,
     "phoneNumber": 31624971134,
diff --git a/mms/testdata/mmsMessageObject.json b/mms/testdata/mmsMessageObject.json
@@ -2,11 +2,11 @@
     "body": "Hello World",
     "createdDatetime": "2017-10-20T12:50:28+00:00",
     "direction": "mt",
-    "href": "https:\/\/rest.messagebird.com\/mms\/6d9e7100b1f9406c81a3c303c30ccf05",
+    "href": "https://rest.messagebird.com/mms/6d9e7100b1f9406c81a3c303c30ccf05",
     "id": "6d9e7100b1f9406c81a3c303c30ccf05",
     "mediaUrls": [
-        "http:\/\/w3.org\/1.gif",
-        "http:\/\/w3.org\/2.gif"
+        "http://w3.org/1.gif",
+        "http://w3.org/2.gif"
     ],
     "originator": "TestName",
     "recipients": {
diff --git a/sms/testdata/binaryMessageObject.json b/sms/testdata/binaryMessageObject.json
@@ -4,7 +4,7 @@
     "datacoding": "unicode",
     "direction": "mt",
     "gateway": 10,
-    "href": "https:\/\/rest.messagebird.com\/messages\/6fe65f90454aa61536e6a88b88972670",
+    "href": "https://rest.messagebird.com/messages/6fe65f90454aa61536e6a88b88972670",
     "id": "6fe65f90454aa61536e6a88b88972670",
     "mclass": 1,
     "originator": "TestName",
diff --git a/sms/testdata/flashMessageObject.json b/sms/testdata/flashMessageObject.json
@@ -4,7 +4,7 @@
     "datacoding": "unicode",
     "direction": "mt",
     "gateway": 10,
-    "href": "https:\/\/rest.messagebird.com\/messages\/6fe65f90454aa61536e6a88b88972670",
+    "href": "https://rest.messagebird.com/messages/6fe65f90454aa61536e6a88b88972670",
     "id": "6fe65f90454aa61536e6a88b88972670",
     "mclass": 0,
     "originator": "TestName",
diff --git a/sms/testdata/messageListObject.json b/sms/testdata/messageListObject.json
@@ -4,15 +4,15 @@
     "count": 2,
     "totalCount": 2,
     "links": {
-        "first": "https:\/\/rest.messagebird.com\/messages\/?offset=0",
+        "first": "https://rest.messagebird.com/messages/?offset=0",
         "previous": null,
         "next": null,
-        "last": "https:\/\/rest.messagebird.com\/messages\/?offset=0"
+        "last": "https://rest.messagebird.com/messages/?offset=0"
     },
     "items": [
         {
             "id": "6fe65f90454aa61536e6a88b88972670",
-            "href": "https:\/\/rest.messagebird.com\/messages\/6fe65f90454aa61536e6a88b88972670",
+            "href": "https://rest.messagebird.com/messages/6fe65f90454aa61536e6a88b88972670",
             "direction": "mt",
             "type": "sms",
             "originator": "TestName",
@@ -41,7 +41,7 @@
         },
         {
             "id": "6fe65f90454aa61536e6a88b88972670",
-            "href": "https:\/\/rest.messagebird.com\/messages\/6fe65f90454aa61536e6a88b88972670",
+            "href": "https://rest.messagebird.com/messages/6fe65f90454aa61536e6a88b88972670",
             "direction": "mt",
             "type": "sms",
             "originator": "TestName",
diff --git a/sms/testdata/messageObject.json b/sms/testdata/messageObject.json
@@ -4,7 +4,7 @@
     "datacoding": "plain",
     "direction": "mt",
     "gateway": 239,
-    "href": "https:\/\/rest.messagebird.com\/messages\/6fe65f90454aa61536e6a88b88972670",
+    "href": "https://rest.messagebird.com/messages/6fe65f90454aa61536e6a88b88972670",
     "id": "6fe65f90454aa61536e6a88b88972670",
     "mclass": 1,
     "originator": "TestName",
diff --git a/sms/testdata/messageObjectWithCreatedDatetime.json b/sms/testdata/messageObjectWithCreatedDatetime.json
@@ -4,7 +4,7 @@
     "datacoding": "plain",
     "direction": "mt",
     "gateway": 239,
-    "href": "https:\/\/rest.messagebird.com\/messages\/6fe65f90454aa61536e6a88b88972670",
+    "href": "https://rest.messagebird.com/messages/6fe65f90454aa61536e6a88b88972670",
     "id": "6fe65f90454aa61536e6a88b88972670",
     "mclass": 1,
     "originator": "TestName",
diff --git a/sms/testdata/messageWithParamsObject.json b/sms/testdata/messageWithParamsObject.json
@@ -4,7 +4,7 @@
     "datacoding": "unicode",
     "direction": "mt",
     "gateway": 10,
-    "href": "https:\/\/rest.messagebird.com\/messages\/6fe65f90454aa61536e6a88b88972670",
+    "href": "https://rest.messagebird.com/messages/6fe65f90454aa61536e6a88b88972670",
     "id": "6fe65f90454aa61536e6a88b88972670",
     "mclass": 1,
     "originator": "TestName",
diff --git a/sms/testdata/premiumMessageObject.json b/sms/testdata/premiumMessageObject.json
@@ -4,7 +4,7 @@
     "datacoding": "unicode",
     "direction": "mt",
     "gateway": 10,
-    "href": "https:\/\/rest.messagebird.com\/messages\/6fe65f90454aa61536e6a88b88972670",
+    "href": "https://rest.messagebird.com/messages/6fe65f90454aa61536e6a88b88972670",
     "id": "6fe65f90454aa61536e6a88b88972670",
     "mclass": 1,
     "originator": "TestName",
diff --git a/verify/testdata/verifyObject.json b/verify/testdata/verifyObject.json
@@ -1,10 +1,10 @@
 {
     "id": "15498233759288aaf929661v21936686",
-    "href": "https:\/\/rest.messagebird.com\/verify\/15498233759288aaf929661v21936686",
+    "href": "https://rest.messagebird.com/verify/15498233759288aaf929661v21936686",
     "recipient": 31612345678,
     "reference": "MyReference",
     "messages": {
-        "href": "https:\/\/rest.messagebird.com\/messages\/c2bbd563759288aaf962910b56023756"
+        "href": "https://rest.messagebird.com/messages/c2bbd563759288aaf962910b56023756"
     },
     "status": "sent",
     "createdDatetime": "2017-05-26T20:06:07+00:00",
diff --git a/verify/testdata/verifyTokenObject.json b/verify/testdata/verifyTokenObject.json
@@ -1,10 +1,10 @@
 {
     "id": "a3f2edb23592d68163f9694v13904556",
-    "href": "https:\/\/rest.messagebird.com\/verify\/a3f2edb23592d68163f9694v13904556",
+    "href": "https://rest.messagebird.com/verify/a3f2edb23592d68163f9694v13904556",
     "recipient": 31612345678,
     "reference": "MyReference",
     "messages": {
-        "href": "https:\/\/rest.messagebird.com\/messages\/63b168423592d681641eb07b76226648"
+        "href": "https://rest.messagebird.com/messages/63b168423592d681641eb07b76226648"
     },
     "status": "verified",
     "createdDatetime": "2017-05-30T12:39:50+00:00",
diff --git a/voicemessage/testdata/voiceMessageListObject.json b/voicemessage/testdata/voiceMessageListObject.json
@@ -4,7 +4,7 @@
         {
             "body": "Hello World",
             "createdDatetime": "2015-01-05T16:11:24+00:00",
-            "href": "https:\/\/rest.messagebird.com\/voicemessages\/430c44a0354aab7ac9553f7a49907463",
+            "href": "https://rest.messagebird.com/voicemessages/430c44a0354aab7ac9553f7a49907463",
             "id": "430c44a0354aab7ac9553f7a49907463",
             "ifMachine": "continue",
             "language": "en-gb",
@@ -30,7 +30,7 @@
         {
             "body": "Hello World",
             "createdDatetime": "2015-01-05T16:11:24+00:00",
-            "href": "https:\/\/rest.messagebird.com\/voicemessages\/430c44a0354aab7ac9553f7a49907463",
+            "href": "https://rest.messagebird.com/voicemessages/430c44a0354aab7ac9553f7a49907463",
             "id": "430c44a0354aab7ac9553f7a49907463",
             "ifMachine": "continue",
             "language": "en-gb",
@@ -56,8 +56,8 @@
     ],
     "limit": 20,
     "links": {
-        "first": "https:\/\/rest.messagebird.com\/voicemessages\/?offset=0",
-        "last": "https:\/\/rest.messagebird.com\/voicemessages\/?offset=0",
+        "first": "https://rest.messagebird.com/voicemessages/?offset=0",
+        "last": "https://rest.messagebird.com/voicemessages/?offset=0",
         "next": null,
         "previous": null
     },
diff --git a/voicemessage/testdata/voiceMessageObject.json b/voicemessage/testdata/voiceMessageObject.json
@@ -1,7 +1,7 @@
 {
     "body": "Hello World",
     "createdDatetime": "2015-01-05T16:11:24+00:00",
-    "href": "https:\/\/rest.messagebird.com\/voicemessages\/430c44a0354aab7ac9553f7a49907463",
+    "href": "https://rest.messagebird.com/voicemessages/430c44a0354aab7ac9553f7a49907463",
     "id": "430c44a0354aab7ac9553f7a49907463",
     "ifMachine": "continue",
     "language": "en-gb",
diff --git a/voicemessage/testdata/voiceMessageObjectWithCreatedDatetime.json b/voicemessage/testdata/voiceMessageObjectWithCreatedDatetime.json
@@ -1,7 +1,7 @@
 {
     "body": "Hello World",
     "createdDatetime": "2015-01-05T16:11:24+00:00",
-    "href": "https:\/\/rest.messagebird.com\/voicemessages\/430c44a0354aab7ac9553f7a49907463",
+    "href": "https://rest.messagebird.com/voicemessages/430c44a0354aab7ac9553f7a49907463",
     "id": "430c44a0354aab7ac9553f7a49907463",
     "ifMachine": "continue",
     "language": "en-gb",
diff --git a/voicemessage/testdata/voiceMessageObjectWithParams.json b/voicemessage/testdata/voiceMessageObjectWithParams.json
@@ -1,7 +1,7 @@
 {
     "body": "Hello World",
     "createdDatetime": "2015-01-05T16:11:24+00:00",
-    "href": "https:\/\/rest.messagebird.com\/voicemessages\/430c44a0354aab7ac9553f7a49907463",
+    "href": "https://rest.messagebird.com/voicemessages/430c44a0354aab7ac9553f7a49907463",
     "id": "430c44a0354aab7ac9553f7a49907463",
     "ifMachine": "hangup",
     "language": "en-gb",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"id": "27978c50354a93ca0ca8de6h54340177",`
`3`		`- "href": "https:\/\/rest.messagebird.com\/hlr\/27978c50354a93ca0ca8de6h54340177",`
	`3`	`+ "href": "https://rest.messagebird.com/hlr/27978c50354a93ca0ca8de6h54340177",`
`4`	`4`	`"msisdn": 31612345678,`
`5`	`5`	`"network": 20406,`
`6`	`6`	`"reference": "MyReference",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "href": "https:\/\/rest.messagebird.com\/lookup\/31624971134",`
	`2`	`+ "href": "https://rest.messagebird.com/lookup/31624971134",`
`3`	`3`	`"countryCode": "NL",`
`4`	`4`	`"countryPrefix": 31,`
`5`	`5`	`"phoneNumber": 31624971134,`