Skip to content

Commit d8a900f

Browse files
author
maskara
committed
Fix tests
1 parent e22a1a5 commit d8a900f

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

app/src/main/java/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApi.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,6 @@ public boolean validateLogin() throws IOException {
221221
@Override
222222
public String getEditToken() throws IOException {
223223
String editToken = api.action("query")
224-
.param("action", "query")
225224
.param("centralauthtoken", getCentralAuthToken())
226225
.param("meta", "tokens")
227226
.post()

app/src/test/kotlin/fr/free/nrw/commons/mwapi/ApacheHttpClientMediaWikiApiTest.kt

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,15 +182,23 @@ class ApacheHttpClientMediaWikiApiTest {
182182

183183
@Test
184184
fun editToken() {
185-
server.enqueue(MockResponse().setBody("<?xml version=\"1.0\"?><api><tokens edittoken=\"baz\" /></api>"))
185+
server.enqueue(MockResponse().setBody("<?xml version=\"1.0\"?><api><centralauthtoken centralauthtoken=\"abc\" /></api>"))
186+
server.enqueue(MockResponse().setBody("<?xml version=\"1.0\"?><api><query><tokens csrftoken=\"baz\" /></query></api>"))
186187

187188
val result = testObject.editToken
188189

189-
assertBasicRequestParameters(server, "GET").let { loginTokenRequest ->
190-
parseQueryParams(loginTokenRequest).let { params ->
190+
assertBasicRequestParameters(server, "GET").let { centralAuthTokenRequest ->
191+
parseQueryParams(centralAuthTokenRequest).let { params ->
191192
assertEquals("xml", params["format"])
192-
assertEquals("tokens", params["action"])
193-
assertEquals("edit", params["type"])
193+
assertEquals("centralauthtoken", params["action"])
194+
}
195+
}
196+
197+
assertBasicRequestParameters(server, "POST").let { editTokenRequest ->
198+
parseBody(editTokenRequest.body.readUtf8()).let { body ->
199+
assertEquals("query", body["action"])
200+
assertEquals("abc", body["centralauthtoken"])
201+
assertEquals("tokens", body["meta"])
194202
}
195203
}
196204

0 commit comments

Comments
 (0)