Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
e70a334
Try the user inserted URL first, and check that all XML-RPC methods a…
daniloercoli Feb 29, 2016
b7f5958
Remove 'wp-login.php' from input URL
daniloercoli Mar 1, 2016
db46961
Remove junk before the xml preamble in the RSD parsing method.
daniloercoli Mar 1, 2016
57ea8e6
Remove "wp-login.php" if available in the input URL, and fix other mi…
daniloercoli Mar 1, 2016
d4a1b91
Merge branch 'develop' of https://github.com/wordpress-mobile/WordPre…
daniloercoli Mar 1, 2016
6ffbacf
Introduce "smart" algorithms that guess the URL of the site.
daniloercoli Mar 2, 2016
6f47e4c
Always use lowercase URL. This commit needs to be double checked.
daniloercoli Mar 2, 2016
c87afdf
Refactoring the code that check the validity of the XML-RPC Endpoint
daniloercoli Mar 2, 2016
9356320
Check for BB plugins on the server.
daniloercoli Mar 2, 2016
c267865
Added few more comments, and cleaned the code a bit.
daniloercoli Mar 2, 2016
fdab062
Refactoring.
daniloercoli Mar 2, 2016
9e7fa5e
Reverting 6f47e4c5a2d0764e678e800c78f7d0ba1dbb397f - don't force the …
daniloercoli Mar 3, 2016
4c00304
Better logging
daniloercoli Mar 3, 2016
2f297d4
Catch Timeout error and show a detailed error mesage instead of a gen…
daniloercoli Mar 3, 2016
a5a6198
Merge branch 'develop' of https://github.com/wordpress-mobile/WordPre…
daniloercoli Mar 3, 2016
4760505
Move the document with BB plugins to xmlrpc.eritreo.it.
daniloercoli Mar 3, 2016
07f2341
Do not return xml-rpc endpoint found but have missing methods when th…
daniloercoli Mar 3, 2016
ef7a750
Correctly catch redirect errors on login, and remove the Crashlytics …
daniloercoli Mar 3, 2016
60e4d23
Remove any external dependencies from the PluginsChecker. Just use An…
daniloercoli Mar 3, 2016
10583c3
Download the BB plugins list from the new shiny repo on Github
daniloercoli Mar 3, 2016
d122b49
Move the plugins checker to the "future" folder. It's not going to be…
daniloercoli Mar 3, 2016
a5afb6a
Bump Analytics when the user inserts an invalid URL
daniloercoli Mar 3, 2016
fcf063d
Remove unused imports.
daniloercoli Mar 4, 2016
7bc9296
Testable login url and runner of xplat tests
hypest Mar 4, 2016
49ea8e1
Testable login url and runner of xplat tests
hypest Mar 4, 2016
bbf7d52
Make healthcheck test runner accept null inputUrl
hypest Mar 4, 2016
16ca088
Cover the case were inputUrl is whitespace
hypest Mar 4, 2016
9f87768
Removed unnecessary if statement.
daniloercoli Mar 5, 2016
58a6f92
Remove padding whitespace from siteURL, test it
hypest Mar 5, 2016
00b509d
Remove padding whitespace from siteURL, test it
hypest Mar 5, 2016
1f3e7b1
Correctly use break instead of continue to exit a loop immediately.
daniloercoli Mar 7, 2016
1db3fba
Make 'appendXMLRPCPath' more readable by using charAt instead of subs…
daniloercoli Mar 7, 2016
4a72aad
Test runner for xmlrpc discovery healthcheck
hypest Mar 8, 2016
66242ec
Adds an xplat test for xmlrpc discovery
hypest Mar 8, 2016
eeb0705
Adds an xplat test for xmlrpc discovery
hypest Mar 8, 2016
d861338
Test runner that can mock responses from assets
hypest Mar 10, 2016
c5c9da6
Add test with xmlrpc.php endpoint responding normally
hypest Mar 10, 2016
bff73ae
Add test with xmlrpc.php endpoint responding normally
hypest Mar 10, 2016
8f93ada
Fix: replace server magic name in body assets
hypest Mar 10, 2016
880dac5
Shutdown the MockWebServer between mock tests
hypest Mar 10, 2016
638bfff
Test xmlrpc discovery with redirection
hypest Mar 10, 2016
81db586
Test xmlrpc discovery with redirection
hypest Mar 10, 2016
ff22486
Merge branch 'develop' of https://github.com/wordpress-mobile/WordPre…
daniloercoli Mar 10, 2016
e0ac745
Fix an issue where the "erroneous SSL cert" flag was not set to true …
daniloercoli Mar 10, 2016
6826b58
Do not track the "Invalid inserted URL" event when the user has inser…
daniloercoli Mar 10, 2016
5841622
Small code re-org for readability
hypest Mar 10, 2016
f41462f
Move functions back to FetchBlogListWPOrg
hypest Mar 11, 2016
52088e5
Merge branch 'feature/3805-improve-self-hosted-login-internals' into …
hypest Mar 11, 2016
a0cd889
Break down to more descriptive helper routines
hypest Mar 11, 2016
2154faf
Implement serializable in PlanFeaturesHighlightSection
nbradbury Mar 11, 2016
5ffdcc8
Simplified by only serializing SitePlan in fragment
nbradbury Mar 11, 2016
c1b7eae
Merge pull request #3857 from wordpress-mobile/issue/3855-plans-not-s…
daniloercoli Mar 14, 2016
fecdfc7
Rename to getUserBlogsList
hypest Mar 15, 2016
661d13f
Merge branch 'develop' into feature/health-check-mvp
hypest Mar 15, 2016
050e9de
Restrict healthcheck tests locale to english
hypest Mar 21, 2016
20c519a
Delete the xplat source tree so to subtree-add it
hypest Mar 21, 2016
f63a1df
Add 'WordPress/src/androidTest/assets/health-check/' from commit '81d…
hypest Mar 21, 2016
fe0d671
Add subtree pull instructions in CONTIBUTING.md
hypest Mar 21, 2016
37d6eef
Add comments on the black box scanner tools.
daniloercoli Mar 21, 2016
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
8 changes: 8 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,14 @@ The Android build tools now allow drawable resources to be provided exclusively
From the [release notes](http://tools.android.com/tech-docs/new-build-system):
`PNGs are generated for every vector drawable found in a resource directory that does not specify an API version (or specifies a version lower than 21).`

# Subtree'd projects

The [WordPress-HealthCheck-Common][healthcheck] project is used in the tests and loaded from `assets` on tests run. Use the following command to pull in newer commits from the external project:

$ git subtree pull --prefix=WordPress/src/androidTest/assets/health-check/ https://github.com/wordpress-mobile/WordPress-HealthCheck-Common.git develop

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should list other subtrees and just give the generic command to pull / push


[healthcheck]: https://github.com/wordpress-mobile/WordPress-HealthCheck-Common

# Contribute to translations

We use a tool called GlotPress to manage translations. The WordPress-Android GlotPress instance lives here: http://translate.wordpress.org/projects/apps/android/dev. To add new translations or fix existing ones, create an account over at GlotPress and submit your changes over at the GlotPress site.
Expand Down
2 changes: 2 additions & 0 deletions WordPress/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ dependencies {
androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.0'
androidTestCompile 'org.objenesis:objenesis:2.1'
androidTestCompile 'org.mockito:mockito-core:+'
androidTestCompile 'com.squareup.okhttp:mockwebserver:2.7.5'


// Provided by the WordPress-Android Repository
compile 'org.wordpress:drag-sort-listview:0.6.1' // not found in maven central
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,229 @@
{
"testcases": [
{
"comment": "testing empty url",
"realm": "URL_CANONICALIZATION",
"setup": {
"input": {
"siteUrl": ""
},
"output": {
"error": {
"type": "SITE_URL_CANNOT_BE_EMPTY",
"message": "Check that the site URL entered is valid"
}
}
}
},
{
"comment": "testing whitespace url",
"realm": "URL_CANONICALIZATION",
"setup": {
"input": {
"siteUrl": " "
},
"output": {
"error": {
"type": "SITE_URL_CANNOT_BE_EMPTY",
"message": "Check that the site URL entered is valid"
}
}
}
},
{
"comment": "testing null url",
"realm": "URL_CANONICALIZATION",
"setup": {
"input": {
"siteUrl": null
},
"output": {
"error": {
"type": "SITE_URL_CANNOT_BE_EMPTY",
"message": "Check that the site URL entered is valid"
}
}
}
},
{
"comment": "testing padding whitespace",
"realm": "URL_CANONICALIZATION",
"setup": {
"input": {
"siteUrl": " \t http://wordpress.com \t "
},
"output": {
"siteUrl": "http://wordpress.com"
}
}
},
{
"comment": "testing xmlrpc.php missing",
"realm": "XMLPRC_DISCOVERY",
"setup": {
"input": {
"serverMock": [
{
"request": {
"method": "GET",
"path": "/"
},
"response": {
"statusCode": 404
}
},
{
"request": {
"method": "GET",
"path": "/xmlrpc.php"
},
"response": {
"statusCode": 404
}
},
{
"request": {
"method": "POST",
"path": "/"
},
"response": {
"statusCode": 404
}
},
{
"request": {
"method": "POST",
"path": "/xmlrpc.php"
},
"response": {
"statusCode": 404
}
}
]
},
"output": {
"error": {
"type": "XMLRPC_MISSING",
"message": "Couldn't connect to the WordPress site"
}
}
}
},
{
"comment": "testing xmlrpc.php found",
"realm": "XMLPRC_DISCOVERY",
"setup": {
"input": {
"serverMock": [
{
"request": {
"method": "POST",
"path": "/xmlrpc.php"
},
"response": {
"statusCode": 200,
"body": "asset:listMethodsResponse.xml"
}
}
]
},
"output": {
"xmlrpcEndpoint": "http://mockserver/xmlrpc.php"
}
}
},
{
"comment": "testing xmlrpc.php discovered after redirect",
"realm": "XMLPRC_DISCOVERY",
"setup": {
"input": {
"siteUrl": "http://mockserver/wp",
"serverMock": [
{
"request": {
"method": "GET",
"path": "/wp"
},
"response": {
"statusCode": 301,
"headers": {
"Location": "/wpnew/"
},
"body": "Page has moved!"
}
},
{
"request": {
"method": "POST",
"path": "/wp"
},
"response": {
"statusCode": 307,
"headers": {
"Location": "/wpnew/"
},
"body": "Page has moved! POST to new address!"
}
},
{
"request": {
"method": "POST",
"path": "/wp/xmlrpc.php"
},
"response": {
"statusCode": 307,
"headers": {
"Location": "/wpnew/xmlrpc.php"
},
"body": "Page has moved! POST to new address!"
}
},
{
"request": {
"method": "GET",
"path": "/wpnew/"
},
"response": {
"statusCode": 200,
"body": "asset:index_with_redirect.html"
}
},
{
"request": {
"method": "GET",
"path": "/wpnew/xmlrpc.php?rsd"
},
"response": {
"statusCode": 200,
"body": "asset:rsd_with_redirect.xml"
}
},
{
"request": {
"method": "GET",
"path": "/wpnew/xmlrpc.php"
},
"response": {
"statusCode": 405,
"body": "XML-RPC server accepts POST requests only."
}
},
{
"request": {
"method": "POST",
"path": "/wpnew/xmlrpc.php"
},
"response": {
"statusCode": 200,
"body": "asset:listMethodsResponse.xml"
}
}
]
},
"output": {
"xmlrpcEndpoint": "http://mockserver/wpnew/xmlrpc.php"
}
}
}
]
}
Loading