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

CRM-19752 - Unit Test for issue CRM-19752 #9746

Merged
merged 1 commit into from
Feb 1, 2018

Conversation

vedantrathore
Copy link
Contributor

@vedantrathore vedantrathore commented Jan 28, 2017

Extracted a function getSummaryQuery(), added unit Tests for checking the function with ACL's enabled and ACL's disabled.


@civicrm-builder
Copy link

Can one of the admins verify this patch?

@vedantrathore
Copy link
Contributor Author

@eileenmcnaughton could you please review this?

@colemanw
Copy link
Member

@civicrm-builder add to whitelist

@eileenmcnaughton eileenmcnaughton self-assigned this Jan 28, 2017
@eileenmcnaughton
Copy link
Contributor

test this please

@eileenmcnaughton
Copy link
Contributor

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)

@vedantrathore
Copy link
Contributor Author

@eileenmcnaughton I have rebased and squashed them into a single commit, I think this should work now.

@eileenmcnaughton
Copy link
Contributor

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

@vedantrathore
Copy link
Contributor Author

Ok cool, I'll see the jenkins report, will civilint do the same job?

@colemanw
Copy link
Member

colemanw commented Feb 7, 2017 via email

@vedantrathore
Copy link
Contributor Author

Okay, thanks @colemanw 😄

@vedantrathore
Copy link
Contributor Author

@eileenmcnaughton All tests passed, I think It's mergeable now. :)

@mlutfy
Copy link
Member

mlutfy commented Nov 16, 2017

jenkins, test this please

@mlutfy mlutfy changed the title (WIP) CRM-19752 - Unit Test for issue CRM-19752 CRM-19752 - Unit Test for issue CRM-19752 Nov 16, 2017

$query = $this->getSummaryQuery($where, $from);
$where = $query[0];
$from = $query[1];
Copy link
Contributor

Choose a reason for hiding this comment

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

this needs to be .=

Copy link
Contributor

Choose a reason for hiding this comment

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

nope it doesnt'

@eileenmcnaughton
Copy link
Contributor

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

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

Successfully merging this pull request may close these issues.

5 participants