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.

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

Fix for the #78 #84

Merged
merged 4 commits into from
Sep 13, 2015
Merged

Fix for the #78 #84

merged 4 commits into from
Sep 13, 2015

Conversation

wakr
Copy link
Contributor

@wakr wakr commented Sep 9, 2015

#78

This pull request will fix the .jsons and tests which were pointing to production URLs. All .jsons should now follow the logic example.com/{resource}/ and the example.com acts as a placeholder for the test address. This "test address" is usually localhost:{freeport}.

@wakr wakr changed the title Fix for the ![#78](https://github.com/testmycode/tmc-core/issues/78) Fix for the #78 Sep 9, 2015

@SerializedName("zip_url")
private String zipUrl; //": "https://tmc.mooc.fi/staging/exercises/284.zip",
private String zipUrl; //": "https://example.com/staging/exercises/284.zip",
Copy link
Member

Choose a reason for hiding this comment

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

I think we could just drop these sample strings here... (no need to do it in this PR but you can if you wish so)

@jamo
Copy link
Member

jamo commented Sep 11, 2015

LGTM, nice work.

Please rebase this on master and let us know, so that we can merge it.

@ljleppan request for LGTM or comments

@ljleppan
Copy link
Member

LGTM

@wakr wakr force-pushed the replaced_urls_@tests branch from 9e29d32 to e3a1416 Compare September 12, 2015 18:54
DarthKipsu and others added 4 commits September 13, 2015 12:27
Fixes testmycode#77

refactor strings to URI changes

arrange two more imports
…on zip_url-field

fix indentation

fix indentation and import orders
…later as a placeholder for example Wiremock's localhost.

DownloadExercisesTest also modified for this.

2/5 of .jsons now fixed.

4/5 of .jsons now mainly uses example.com which is later(dynamically) changed to 127.0.0.1
if wiremock is present while testing

All .jsons and tests are now free of the "tmc.mooc.fi"-address. Also other
real addresses were changed to example.com.

Fixed little bug where 153 was 152. Correct amount of courses in course.json is 153 (checked with grep)
Fixes testmycode#77

refactor strings to URI changes

arrange two more imports

fix indentation

fix indentation and import orders

fixed little bug

Brought back zip_url because it got lost after rebasing
@wakr wakr force-pushed the replaced_urls_@tests branch from b9fca1c to 335e0a6 Compare September 13, 2015 10:16
@wakr
Copy link
Contributor Author

wakr commented Sep 13, 2015

Rebased 👍

jamo added a commit that referenced this pull request Sep 13, 2015
For tests use url pointing to example.com instead of using prod urls
@jamo jamo merged commit 521f7e0 into testmycode:master Sep 13, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants