Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix parameter name ConverstationsBaseUrl to ConversationsBaseUrl #91

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix parameter name ConverstationsBaseUrl to ConversationsBaseUrl #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
261249d
Merge pull request #2 from messagebird/master
ahmetkocadogan Nov 17, 2020
6325fd9
Fix ConverstationsBaseUrl to ConversationsBaseUrl
ahmetkocadogan Dec 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion MessageBird/Resources/Conversations/Contacts.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public class Contacts : Resource
public Contacts() : this(new Objects.Conversations.Contact()) { }
public override string BaseUrl
{
get { return Conversations.ConverstationsBaseUrl; }
get { return Conversations.ConversationsBaseUrl; }
}
}
}
2 changes: 1 addition & 1 deletion MessageBird/Resources/Conversations/ConversationLists.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ public ConversationLists()
{ }
public override string BaseUrl
{
get { return Conversations.ConverstationsBaseUrl; }
get { return Conversations.ConversationsBaseUrl; }
}
}
}
2 changes: 1 addition & 1 deletion MessageBird/Resources/Conversations/ConversationStart.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public override string Serialize()
}
public override string BaseUrl
{
get { return Conversations.ConverstationsBaseUrl; }
get { return Conversations.ConversationsBaseUrl; }
}
}
}
2 changes: 1 addition & 1 deletion MessageBird/Resources/Conversations/Conversations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public class Conversations : Resource
public Conversations() : this(new Objects.Conversations.Conversation()) { }
public override string BaseUrl
{
get { return ConverstationsBaseUrl; }
get { return ConversationsBaseUrl; }
}

public override UpdateMode UpdateMode
Expand Down
2 changes: 1 addition & 1 deletion MessageBird/Resources/Conversations/MessageLists.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public override string Uri

public override string BaseUrl
{
get { return Conversations.ConverstationsBaseUrl; }
get { return Conversations.ConversationsBaseUrl; }
}
}
}
2 changes: 1 addition & 1 deletion MessageBird/Resources/Conversations/MessageSend.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public override string Uri

public override string BaseUrl
{
get { return Conversations.ConverstationsBaseUrl; }
get { return Conversations.ConversationsBaseUrl; }
}
}
}
2 changes: 1 addition & 1 deletion MessageBird/Resources/Conversations/Messages.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public override string Uri

public override string BaseUrl
{
get { return ConverstationsBaseUrl; }
get { return ConversationsBaseUrl; }
}
}
}
2 changes: 1 addition & 1 deletion MessageBird/Resources/Conversations/WebhookLists.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public WebhookLists()

public override string BaseUrl
{
get { return ConverstationsBaseUrl; }
get { return ConversationsBaseUrl; }
}
}
}
2 changes: 1 addition & 1 deletion MessageBird/Resources/Conversations/Webhooks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public class Webhooks : Resource

public override string BaseUrl
{
get { return Conversations.ConverstationsBaseUrl; }
get { return Conversations.ConversationsBaseUrl; }
}
}
}
2 changes: 1 addition & 1 deletion MessageBird/Resources/Resource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace MessageBird.Resources
{
public abstract class Resource
{
public static string ConverstationsBaseUrl = "https://conversations.messagebird.com/v1";
public static string ConversationsBaseUrl = "https://conversations.messagebird.com/v1";
public static string DefaultBaseUrl = "https://rest.messagebird.com";

public string Id
Expand Down
28 changes: 14 additions & 14 deletions Tests/UnitTests/MessageBirdUnitTests/Resources/ConversationTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public void Start()
.ThatExpects(
@"{""to"":""+31612345678"",""type"":""text"",""content"":{""text"":""Hello!""},""channelId"":""619747f69cf940a98fb443140ce9aed2""}")
.AndReturns(filename: "ConversationView.json")
.FromEndpoint("POST", "conversations/start", Resource.ConverstationsBaseUrl)
.FromEndpoint("POST", "conversations/start", Resource.ConversationsBaseUrl)
.Get();
var client = Client.Create(restClient.Object);

Expand All @@ -49,7 +49,7 @@ public void List()
{
var restClient = MockRestClient
.ThatReturns(filename: "ConversationList.json")
.FromEndpoint("GET", "conversations?limit=20&offset=0", Resource.ConverstationsBaseUrl)
.FromEndpoint("GET", "conversations?limit=20&offset=0", Resource.ConversationsBaseUrl)
.Get();
var client = Client.Create(restClient.Object);

Expand All @@ -65,7 +65,7 @@ public void ListPagination()
{
var restClient = MockRestClient
.ThatReturns("{}")
.FromEndpoint("GET", "conversations?limit=50&offset=10", Resource.ConverstationsBaseUrl)
.FromEndpoint("GET", "conversations?limit=50&offset=10", Resource.ConversationsBaseUrl)
.Get();
var client = Client.Create(restClient.Object);

Expand All @@ -78,7 +78,7 @@ public void View()
{
var restClient = MockRestClient
.ThatReturns(filename: "ConversationView.json")
.FromEndpoint("GET", "conversations/2e15efafec384e1c82e9842075e87beb", Resource.ConverstationsBaseUrl)
.FromEndpoint("GET", "conversations/2e15efafec384e1c82e9842075e87beb", Resource.ConversationsBaseUrl)
.Get();
var client = Client.Create(restClient.Object);

Expand All @@ -96,7 +96,7 @@ public void Update()
var restClient = MockRestClient
.ThatExpects(@"{""id"":""2e15efafec384e1c82e9842075e87beb"",""status"": ""archived""}")
.AndReturns(filename: "ConversationView.json")
.FromEndpoint("PATCH", $"conversations/{ConvId}", Resource.ConverstationsBaseUrl)
.FromEndpoint("PATCH", $"conversations/{ConvId}", Resource.ConversationsBaseUrl)
.Get();
var client = Client.Create(restClient.Object);

Expand All @@ -114,7 +114,7 @@ public void ListMessages()
var restClient = MockRestClient
.ThatReturns(filename: "ConversationMessagesList.json")
.FromEndpoint("GET", $"conversations/{ConvId}/messages?limit=20&offset=0",
Resource.ConverstationsBaseUrl)
Resource.ConversationsBaseUrl)
.Get();
var client = Client.Create(restClient.Object);

Expand All @@ -132,7 +132,7 @@ public void ListMessagesPagination()
var restClient = MockRestClient
.ThatReturns("{}")
.FromEndpoint("GET", $"conversations/{ConvId}/messages?limit=50&offset=10",
Resource.ConverstationsBaseUrl)
Resource.ConversationsBaseUrl)
.Get();
var client = Client.Create(restClient.Object);

Expand All @@ -146,7 +146,7 @@ public void PostMessage()
var restClient = MockRestClient
.ThatExpects(@"{""type"": ""text"",""content"":{""text"": ""Hello!""}}")
.AndReturns(filename: "ConversationMessage.json")
.FromEndpoint("POST", $"conversations/{ConvId}/messages", Resource.ConverstationsBaseUrl)
.FromEndpoint("POST", $"conversations/{ConvId}/messages", Resource.ConversationsBaseUrl)
.Get();
var client = Client.Create(restClient.Object);

Expand All @@ -171,7 +171,7 @@ public void ViewMessage()
{
var restClient = MockRestClient
.ThatReturns(filename: "ConversationMessage.json")
.FromEndpoint("GET", $"messages/{MsgId}", Resource.ConverstationsBaseUrl)
.FromEndpoint("GET", $"messages/{MsgId}", Resource.ConversationsBaseUrl)
.Get();
var client = Client.Create(restClient.Object);

Expand All @@ -192,7 +192,7 @@ public void PostWebhook()
.ThatExpects(
@"{""events"":[""message.created"", ""message.updated""],""channelId"": ""853eeb5348e541a595da93b48c61a1ae"",""url"":""https://example.com/webhook""}")
.AndReturns(filename: "WebhookView.json")
.FromEndpoint("POST", "webhooks", Resource.ConverstationsBaseUrl)
.FromEndpoint("POST", "webhooks", Resource.ConversationsBaseUrl)
.Get();
var client = Client.Create(restClient.Object);

Expand Down Expand Up @@ -221,7 +221,7 @@ public void ViewWebhook()
{
var restClient = MockRestClient
.ThatReturns(filename: "WebhookView.json")
.FromEndpoint("GET", $"webhooks/{WebhookId}", Resource.ConverstationsBaseUrl)
.FromEndpoint("GET", $"webhooks/{WebhookId}", Resource.ConversationsBaseUrl)
.Get();
var client = Client.Create(restClient.Object);

Expand All @@ -239,7 +239,7 @@ public void DeleteWebhook()
{
var restClient = MockRestClient
.ThatReturns(string.Empty)
.FromEndpoint("DELETE", $"webhooks/{WebhookId}", Resource.ConverstationsBaseUrl)
.FromEndpoint("DELETE", $"webhooks/{WebhookId}", Resource.ConversationsBaseUrl)
.Get();
var client = Client.Create(restClient.Object);

Expand All @@ -253,7 +253,7 @@ public void ListWebhooks()
var restClient = MockRestClient
.ThatReturns(filename: "WebhookList.json")
.FromEndpoint("GET", $"webhooks?limit=20&offset=0",
Resource.ConverstationsBaseUrl)
Resource.ConversationsBaseUrl)
.Get();
var client = Client.Create(restClient.Object);

Expand All @@ -270,7 +270,7 @@ public void ListWebhooksPagination()
var restClient = MockRestClient
.ThatReturns("{}")
.FromEndpoint("GET", $"webhooks?limit=50&offset=10",
Resource.ConverstationsBaseUrl)
Resource.ConversationsBaseUrl)
.Get();
var client = Client.Create(restClient.Object);

Expand Down