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

11: Pass for Twitter added. #175

Merged
merged 12 commits into from
Apr 29, 2015
Merged

11: Pass for Twitter added. #175

merged 12 commits into from
Apr 29, 2015

Conversation

popprem
Copy link
Contributor

@popprem popprem commented Apr 15, 2015

Pass for twitter added. Todo: PsTwitterTest has to be implemented or XeTwitterLink & XeTwitterLinkTest have to be implemented which will test PsTwitter too.

PR #175 for issue #11.

@davvd
Copy link

davvd commented Apr 15, 2015

@popprem Thanks, I will find someone to review this PR soon

@davvd
Copy link

davvd commented Apr 15, 2015

@longtimeago please review,thanks

@popprem popprem mentioned this pull request Apr 15, 2015
@@ -136,6 +136,11 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>commons-codec</groupId>

Choose a reason for hiding this comment

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

@popprem we are not allowed to use external dependency with compile scope. We promised that to our clients.
javax.xml.bind.DatatypeConverter should help

@longtimeago
Copy link

@popprem thanks for the PR. See several remarks above

@popprem
Copy link
Contributor Author

popprem commented Apr 16, 2015

@longtimeago Thanks for the review, have addressed the issues. Please check.

@longtimeago
Copy link

@popprem Now we are good to go, thank you!

@longtimeago
Copy link

@rultor merge please

@rultor
Copy link
Collaborator

rultor commented Apr 17, 2015

@rultor merge please

@longtimeago Thanks for your request. @yegor256 Please confirm this.

@longtimeago
Copy link

@popprem looks like I've missed to note one important thing ... no tests ?? Please, add at least one. Yegor will not leave out this PR without test

@popprem
Copy link
Contributor Author

popprem commented Apr 17, 2015

@longtimeago Yes, I have commented the same on the pull request. Test for PsTwitter is not straightforward ,should be done with oauth mocks etc. Need advise on the same.

@longtimeago
Copy link

@popprem yep ... I see the comment. Add at least todo in the code. Other developer will implement it

@popprem
Copy link
Contributor Author

popprem commented Apr 18, 2015

@longtimeago Test added with todo comment, please check.

@longtimeago
Copy link

@popprem Todo must be formatted as puzzle (see examples https://github.com/teamed/pdd)
@todo #11:30min What actually to be done
Description should be meaningful, more that 20 words. New task will be generated by this todo with description you provided. So, please, put there as much details as possible to avoid questions from next developer. Imagine, you are the developer and will get the task, generated by this todo. What would you like to be mentioned there?

@popprem
Copy link
Contributor Author

popprem commented Apr 18, 2015

@longtimeago Test description updated with proper todo format. Please verify.

@yegor256
Copy link
Owner

@popprem I still don't understand why do you use 8 indentation spaces sometimes and sometimes 4. what is the message here? what are you trying to say by 8 spaces? also, read this: http://www.yegor256.com/2014/10/23/paired-brackets-notation.html

@popprem
Copy link
Contributor Author

popprem commented Apr 21, 2015

@yegor256 Looks cleaner now, please verify.

@yegor256
Copy link
Owner

@rultor merge

@rultor
Copy link
Collaborator

rultor commented Apr 22, 2015

@rultor merge

@yegor256 OK, I'll try to merge now. You can check the progress of the merge here

@rultor
Copy link
Collaborator

rultor commented Apr 22, 2015

@rultor merge

@yegor256 Oops, I failed. You can see the full log here (spent 1min)

Auto-merging src/main/java/org/takes/rs/RsXSLT.java
CONFLICT (add/add): Merge conflict in src/main/java/org/takes/rs/RsXSLT.java
Auto-merging src/main/java/org/takes/rs/xe/XeLinkHome.java
CONFLICT (add/add): Merge conflict in src/main/java/org/takes/rs/xe/XeLinkHome.java
Auto-merging src/main/java/org/takes/rs/xe/XeLinkSelf.java
CONFLICT (add/add): Merge conflict in src/main/java/org/takes/rs/xe/XeLinkSelf.java
Auto-merging src/main/java/org/takes/tk/TkMeasured.java
CONFLICT (add/add): Merge conflict in src/main/java/org/takes/tk/TkMeasured.java
Auto-merging src/main/java/org/takes/tk/TkVerbose.java
CONFLICT (add/add): Merge conflict in src/main/java/org/takes/tk/TkVerbose.java
Auto-merging src/main/java/org/takes/tk/TkVersioned.java
CONFLICT (add/add): Merge conflict in src/main/java/org/takes/tk/TkVersioned.java
Auto-merging src/test/java/org/takes/facets/auth/PsByFlagTest.java
CONFLICT (add/add): Merge conflict in src/test/java/org/takes/facets/auth/PsByFlagTest.java
Auto-merging src/test/java/org/takes/facets/auth/TkAuthTest.java
CONFLICT (add/add): Merge conflict in src/test/java/org/takes/facets/auth/TkAuthTest.java
Auto-merging src/test/java/org/takes/facets/auth/codecs/CcHexTest.java
CONFLICT (add/add): Merge conflict in src/test/java/org/takes/facets/auth/codecs/CcHexTest.java
Auto-merging src/test/java/org/takes/facets/fallback/TkFallbackTest.java
CONFLICT (add/add): Merge conflict in src/test/java/org/takes/facets/fallback/TkFallbackTest.java
Auto-merging src/test/java/org/takes/facets/fork/FkAnonymousTest.java
CONFLICT (add/add): Merge conflict in src/test/java/org/takes/facets/fork/FkAnonymousTest.java
Auto-merging src/test/java/org/takes/facets/fork/FkAuthenticatedTest.java
CONFLICT (add/add): Merge conflict in src/test/java/org/takes/facets/fork/FkAuthenticatedTest.java
Auto-merging src/test/java/org/takes/facets/fork/FkEncodingTest.java
CONFLICT (add/add): Merge conflict in src/test/java/org/takes/facets/fork/FkEncodingTest.java
Auto-merging src/test/java/org/takes/facets/fork/FkHitRefreshTest.java
CONFLICT (add/add): Merge conflict in src/test/java/org/takes/facets/fork/FkHitRefreshTest.java
Auto-merging src/test/java/org/takes/facets/fork/FkMethodsTest.java
CONFLICT (add/add): Merge conflict in src/test/java/org/takes/facets/fork/FkMethodsTest.java
Auto-merging src/test/java/org/takes/facets/fork/FkParamsTest.java
CONFLICT (add/add): Merge conflict in src/test/java/org/takes/facets/fork/FkParamsTest.java
Auto-merging src/test/java/org/takes/facets/fork/FkRegexTest.java
CONFLICT (add/add): Merge conflict in src/test/java/org/takes/facets/fork/FkRegexTest.java
Auto-merging src/test/java/org/takes/facets/fork/FkTypesTest.java
CONFLICT (add/add): Merge conflict in src/test/java/org/takes/facets/fork/FkTypesTest.java
Auto-merging src/test/java/org/takes/facets/forward/TkForwardTest.java
CONFLICT (add/add): Merge conflict in src/test/java/org/takes/facets/forward/TkForwardTest.java
Auto-merging src/test/java/org/takes/http/FtCLITest.java
CONFLICT (add/add): Merge conflict in src/test/java/org/takes/http/FtCLITest.java
Auto-merging src/test/java/org/takes/misc/HrefTest.java
CONFLICT (add/add): Merge conflict in src/test/java/org/takes/misc/HrefTest.java
Auto-merging src/test/java/org/takes/rq/RqCookiesTest.java
CONFLICT (add/add): Merge conflict in src/test/java/org/takes/rq/RqCookiesTest.java
Auto-merging src/test/java/org/takes/rq/RqFormTest.java
CONFLICT (add/add): Merge conflict in src/test/java/org/takes/rq/RqFormTest.java
Auto-merging src/test/java/org/takes/rq/RqHrefTest.java
CONFLICT (add/add): Merge conflict in src/test/java/org/takes/rq/RqHrefTest.java
Auto-merging src/test/java/org/takes/rq/RqMethodTest.java
CONFLICT (add/add): Merge conflict in src/test/java/org/takes/rq/RqMethodTest.java
Auto-merging src/test/java/org/takes/rq/RqMultipartTest.java
CONFLICT (add/add): Merge conflict in src/test/java/org/takes/rq/RqMultipartTest.java
Auto-merging src/test/java/org/takes/rs/RsWithCookieTest.java
CONFLICT (add/add): Merge conflict in src/test/java/org/takes/rs/RsWithCookieTest.java
Auto-merging src/test/java/org/takes/tk/TkMeasuredTest.java
CONFLICT (add/add): Merge conflict in src/test/java/org/takes/tk/TkMeasuredTest.java
Auto-merging src/test/java/org/takes/tk/TkVersionedTest.java
CONFLICT (add/add): Merge conflict in src/test/java/org/takes/tk/TkVersionedTest.java
Automatic merge failed; fix conflicts and then commit the result.

@longtimeago
Copy link

@popprem please, merge from master

@popprem
Copy link
Contributor Author

popprem commented Apr 25, 2015

@longtimeago Have merged from master. Please try merging.

@longtimeago
Copy link

@rultor please merge

@rultor
Copy link
Collaborator

rultor commented Apr 25, 2015

@rultor please merge

@longtimeago Thanks for your request. @yegor256 Please confirm this.

@popprem
Copy link
Contributor Author

popprem commented Apr 28, 2015

@yegor256 Can this be merged please?

@yegor256
Copy link
Owner

@rultor merge

@rultor
Copy link
Collaborator

rultor commented Apr 29, 2015

@rultor merge

@yegor256 OK, I'll try to merge now. You can check the progress of the merge here

@rultor rultor merged commit dfb4c64 into yegor256:master Apr 29, 2015
@rultor
Copy link
Collaborator

rultor commented Apr 29, 2015

@rultor merge

@yegor256 Done! FYI, the full log is here (took me 12min)

@popprem popprem deleted the 11 branch April 29, 2015 13:36
@popprem
Copy link
Contributor Author

popprem commented Apr 29, 2015

@davvd @yegor256 Can this be closed please?

@yegor256
Copy link
Owner

@popprem it is closed already

@davvd
Copy link

davvd commented Apr 30, 2015

@elenavolokhova review this ticket please, for compliance with our quality rules

@davvd
Copy link

davvd commented Apr 30, 2015

@rultor deploy pls

@rultor
Copy link
Collaborator

rultor commented Apr 30, 2015

@rultor deploy pls

@davvd OK, I'll try to deploy now. You can check the progress here

@rultor
Copy link
Collaborator

rultor commented Apr 30, 2015

@rultor deploy pls

@davvd Done! FYI, the full log is here (took me 8min)

@elenavolokhova
Copy link

@longtimeago
Please fix description of this PR. Pull request description should explain the solution proposed and contains a link to the original ticket it is related to.

@popprem
Copy link
Contributor Author

popprem commented May 4, 2015

@elenavolokhova Added link to the original ticket.

@elenavolokhova
Copy link

@popprem Thank you!

@elenavolokhova
Copy link

@davvd Quality is acceptable

@davvd
Copy link

davvd commented May 5, 2015

@davvd Quality is acceptable

@elenavolokhova thanks for the review, we'll try better next time

@davvd
Copy link

davvd commented May 6, 2015

@davvd Quality is acceptable

@elenavolokhova thanks a lot, next time everybody should try to make it better

@davvd
Copy link

davvd commented May 9, 2015

@longtimeago I added 10 mins to @elenavolokhova (for QA review) in transaction 56850215... Thanks a lot, I just topped your account for 26 mins, transaction ID 56850223, total time was 332 hours and 21 mins... you're getting extra minutes here (c=11)... +26 to your rating, your total score is +4581

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants