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

304 migrate unicode arrows #305

Merged
merged 1 commit into from
Dec 12, 2019
Merged

304 migrate unicode arrows #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions github4s/jvm/src/test/scala/github4s/unit/ApiSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,10 +543,10 @@ class ApiSpec
validGistId,
validGistDescription,
Map(
validGistFilename → Some(EditGistFile(validGistFileContent)),
validGistOldFilename → Some(
validGistFilename -> Some(EditGistFile(validGistFileContent)),
validGistOldFilename -> Some(
EditGistFile(validGistFileContent, Some(validGistNewFilename))),
validGistDeletedFilename → None
validGistDeletedFilename -> None
),
headerUserAgent,
accessToken
Expand Down
6 changes: 3 additions & 3 deletions github4s/shared/src/main/scala/github4s/HttpClient.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class HttpRequestBuilder[C, M[_]](

def withAuth(accessToken: Option[String] = None) = {
val authHeader = accessToken match {
case Some(token) ⇒ Map("Authorization" → s"token $token")
case Some(token) ⇒ Map("Authorization" -> s"token $token")
case _ ⇒ Map.empty[String, String]
}
new HttpRequestBuilder[C, M](url, httpVerb, authHeader, data, params, headers)
Expand Down Expand Up @@ -126,7 +126,7 @@ class HttpClient[C, M[_]](
.withAuth(accessToken)
.withHeaders(headers)
.withParams(params ++ pagination.fold(Map.empty[String, String])(p ⇒
Map("page" → p.page.toString, "per_page" → p.per_page.toString))))
Map("page" -> p.page.toString, "per_page" -> p.per_page.toString))))

def patch[A](
accessToken: Option[String] = None,
Expand Down Expand Up @@ -177,7 +177,7 @@ class HttpClient[C, M[_]](
)(implicit D: Decoder[A]): M[GHResponse[A]] =
httpRbImpl.run[A](
httpRequestBuilder(url).postMethod
.withHeaders(Map("Accept" → "application/json") ++ headers)
.withHeaders(Map("Accept" -> "application/json") ++ headers)
.withData(data))

def delete(
Expand Down
6 changes: 3 additions & 3 deletions github4s/shared/src/main/scala/github4s/api/Activities.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,9 +109,9 @@ class Activities[C, M[_]](
s"users/$username/starred",
if (timeline) headers + timelineHeader else headers,
Map(
"sort" → sort,
"direction" → direction
).collect { case (key, Some(value)) ⇒ key → value },
"sort" -> sort,
"direction" -> direction
).collect { case (key, Some(value)) ⇒ key -> value },
pagination = pagination
)

Expand Down
2 changes: 1 addition & 1 deletion github4s/shared/src/main/scala/github4s/api/Auth.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class Auth[C, M[_]](
): M[GHResponse[Authorization]] =
httpClient.postAuth[Authorization](
method = "authorizations",
headers = Map("Authorization" → s"Basic ${s"$username:$password".getBytes.toBase64}") ++ headers,
headers = Map("Authorization" -> s"Basic ${s"$username:$password".getBytes.toBase64}") ++ headers,
data = NewAuthRequest(scopes, note, client_id, client_secret).asJson.noSpaces
)

Expand Down
8 changes: 4 additions & 4 deletions github4s/shared/src/main/scala/github4s/api/Organizations.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ class Organizations[C, M[_]](
s"orgs/$org/members",
headers,
Map(
"filter" → filter,
"role" → role
).collect { case (key, Some(value)) ⇒ key → value },
"filter" -> filter,
"role" -> role
).collect { case (key, Some(value)) ⇒ key -> value },
pagination = pagination
)

Expand All @@ -81,7 +81,7 @@ class Organizations[C, M[_]](
accessToken,
s"orgs/$org/outside_collaborators",
headers,
Map("filter" → filter).collect { case (key, Some(value)) ⇒ key → value },
Map("filter" -> filter).collect { case (key, Some(value)) ⇒ key -> value },
pagination
)

Expand Down
20 changes: 10 additions & 10 deletions github4s/shared/src/main/scala/github4s/api/Repos.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,13 @@ class Repos[C, M[_]](
s"repos/$owner/$repo/commits",
headers,
Map(
"sha" → sha,
"path" → path,
"author" → author,
"since" → since,
"until" → until
"sha" -> sha,
"path" -> path,
"author" -> author,
"since" -> since,
"until" -> until
).collect {
case (key, Some(value)) ⇒ key → value
case (key, Some(value)) ⇒ key -> value
},
pagination
)
Expand All @@ -206,9 +206,9 @@ class Repos[C, M[_]](
s"repos/$owner/$repo/branches",
headers,
Map(
"protected" → onlyProtected.map(_.toString)
"protected" -> onlyProtected.map(_.toString)
).collect {
case (key, Some(value)) ⇒ key → value
case (key, Some(value)) ⇒ key -> value
})

/**
Expand All @@ -234,9 +234,9 @@ class Repos[C, M[_]](
s"repos/$owner/$repo/contributors",
headers,
Map(
"anon" → anon
"anon" -> anon
).collect {
case (key, Some(value)) ⇒ key → value
case (key, Some(value)) ⇒ key -> value
})

/**
Expand Down
2 changes: 1 addition & 1 deletion github4s/shared/src/main/scala/github4s/api/Users.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class Users[C, M[_]](
pagination: Option[Pagination] = None
): M[GHResponse[List[User]]] =
httpClient
.get[List[User]](accessToken, "users", headers, Map("since" → since.toString), pagination)
.get[List[User]](accessToken, "users", headers, Map("since" -> since.toString), pagination)

/**
* Get information for a particular user's list of users they follow
Expand Down
2 changes: 1 addition & 1 deletion github4s/shared/src/test/scala/github4s/unit/AuthSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class AuthSpec extends BaseSpec {
val httpClientMock = httpClientMockPostAuth[Authorization](
url = "authorizations",
headers =
Map("Authorization" → s"Basic ${s"rafaparadela:invalidPassword".getBytes.toBase64}"),
Map("Authorization" -> s"Basic ${s"rafaparadela:invalidPassword".getBytes.toBase64}"),
json = request,
response = response
)
Expand Down
16 changes: 8 additions & 8 deletions github4s/shared/src/test/scala/github4s/unit/GHGistSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ class GHGistSpec extends BaseSpec {
.expects(
validGistDescription,
validGistPublic,
Map(validGistFilename → GistFile(validGistFileContent)),
Map(validGistFilename -> GistFile(validGistFileContent)),
sampleToken)
.returns(response)

val ghGists = new GHGists(sampleToken)(gistOps)
ghGists.newGist(
validGistDescription,
validGistPublic,
Map(validGistFilename → GistFile(validGistFileContent)))
Map(validGistFilename -> GistFile(validGistFileContent)))
}

"Gist.getGist" should "call to GistOps with the right parameters without sha" in {
Expand Down Expand Up @@ -95,9 +95,9 @@ class GHGistSpec extends BaseSpec {
validGistId,
validGistDescription,
Map(
validGistFilename → Some(EditGistFile(validGistFileContent)),
validGistOldFilename → Some(EditGistFile(validGistFileContent, Some(validGistNewFilename))),
validGistDeletedFilename → None
validGistFilename -> Some(EditGistFile(validGistFileContent)),
validGistOldFilename -> Some(EditGistFile(validGistFileContent, Some(validGistNewFilename))),
validGistDeletedFilename -> None
),
sampleToken)
.returns(response)
Expand All @@ -107,9 +107,9 @@ class GHGistSpec extends BaseSpec {
validGistId,
validGistDescription,
Map(
validGistFilename → Some(EditGistFile(validGistFileContent)),
validGistOldFilename → Some(EditGistFile(validGistFileContent, Some(validGistNewFilename))),
validGistDeletedFilename → None
validGistFilename -> Some(EditGistFile(validGistFileContent)),
validGistOldFilename -> Some(EditGistFile(validGistFileContent, Some(validGistNewFilename))),
validGistDeletedFilename -> None
))
}

Expand Down
8 changes: 4 additions & 4 deletions github4s/shared/src/test/scala/github4s/unit/GistSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class GistSpec extends BaseSpec {
gists.newGist(
validGistDescription,
validGistPublic,
Map(validGistFilename → GistFile(validGistFileContent)),
Map(validGistFilename -> GistFile(validGistFileContent)),
headerUserAgent,
sampleToken
)
Expand Down Expand Up @@ -140,9 +140,9 @@ class GistSpec extends BaseSpec {
validGistId,
validGistDescription,
Map(
validGistFilename → Some(EditGistFile(validGistFileContent)),
validGistOldFilename → Some(EditGistFile(validGistFileContent, Some(validGistNewFilename))),
validGistDeletedFilename → None
validGistFilename -> Some(EditGistFile(validGistFileContent)),
validGistOldFilename -> Some(EditGistFile(validGistFileContent, Some(validGistNewFilename))),
validGistDeletedFilename -> None
),
headerUserAgent,
sampleToken
Expand Down
2 changes: 1 addition & 1 deletion github4s/shared/src/test/scala/github4s/unit/ReposSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ class ReposSpec extends BaseSpec {

val httpClientMock = httpClientMockGet[List[Branch]](
url = s"repos/$validRepoOwner/$validRepoName/branches",
params = Map("protected" → "true"),
params = Map("protected" -> "true"),
response = response
)

Expand Down
4 changes: 2 additions & 2 deletions github4s/shared/src/test/scala/github4s/unit/UserSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class UserSpec extends BaseSpec {
val response: GHResponse[List[User]] =
Right(GHResult(List(user), okStatusCode, Map.empty))

val request = Map("since" → 1.toString)
val request = Map("since" -> 1.toString)

val httpClientMock = httpClientMockGet[List[User]](
url = "users",
Expand Down Expand Up @@ -90,6 +90,6 @@ class UserSpec extends BaseSpec {
override val httpClient: HttpClient[String, Id] = httpClientMock
}
users.getFollowing(sampleToken, headerUserAgent, validUsername)
}
}

}