-
-
Notifications
You must be signed in to change notification settings - Fork 814
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
CRM-19752 - Unit Test for issue CRM-19752 #9746
Conversation
Can one of the admins verify this patch? |
@eileenmcnaughton could you please review this? |
@civicrm-builder add to whitelist |
test this please |
If you click through to https://test.civicrm.org/job/CiviCRM-Core-PR/13768/console (click on the console link from the jenkins report) you can see there is a merge issue, perhaps because there are 4 similar looking commits To fix it do a rebase - ie git pull --rebase origin master to push rebased changes back up to your repo you will need to use the -f switch (force) |
@eileenmcnaughton I have rebased and squashed them into a single commit, I think this should work now. |
OK we are homing in on it - you need to fix some more style issues. You could try using https://github.com/civicrm/coder although TBH I used jenkins a lot to check style. When you fix those style issues if you use git commit --amend (& then use the force switch while pushing) you can adjust your existing commit rather than creating a new one |
Ok cool, I'll see the jenkins report, will civilint do the same job? |
Yes, it's generally a good idea to run civilint before committing. It
doesn't check every file in the tree, only the ones with uncommitted
changes.
I wrote a handy little script for frequent contributors, it will run
civilint, checkout a branch, make a commit and then open a pull-request
all in one command:
https://gist.github.com/colemanw/01dae2a2937f6f39c2300b701636b4a8
…On 02/07/2017 01:35 PM, Vedant Rathore wrote:
Ok cool, I'll see the jenkins report, will civilint do the same job?
—
You are receiving this because you commented.
Reply to this email directly, view it on GitHub
<#9746 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/ACveILINY1f_Ao_8BFOmdfc2seXJyrlfks5raLmNgaJpZM4Lwc_m>.
|
Okay, thanks @colemanw 😄 |
@eileenmcnaughton All tests passed, I think It's mergeable now. :) |
jenkins, test this please |
|
||
$query = $this->getSummaryQuery($where, $from); | ||
$where = $query[0]; | ||
$from = $query[1]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this needs to be .=
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nope it doesnt'
Sorry about the huge delay on reviewing this. I just took a look & my reservation was that I want to take this change a bit further. However, this PR moves us in the right direction & adds patches so I'm going to merge & then add more as a follow up |
Extracted a function getSummaryQuery(), added unit Tests for checking the function with ACL's enabled and ACL's disabled.