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

Jump to bottom

Remove Login link from error page #8831

Merged
merged 1 commit into from Sep 21, 2015
Merged

Remove Login link from error page #8831

merged 1 commit into from Sep 21, 2015

Conversation

Joey3000
Copy link
Contributor

Fixes #8808

@Joey3000 Joey3000 mentioned this pull request Sep 21, 2015
Closed
@Joey3000
Copy link
Contributor Author

Note: On merge of this PR, an update of following expected screenshots is needed, as per the failing Travis build. (The screenshots change due to the removal of the Login link from the error page.) Please refer to https://github.com/piwik/piwik/blob/master/tests/README.screenshots.md for information.

  1) UIIntegrationTest should not allow to widgetize an API call:

     Processed screenshot does not match expected for UIIntegrationTest_widgetize_apidisallowed.png (1187px difference)

       Url to reproduce: http://localhost/tests/PHPUnit/proxy/?module=Widgetize&action=iframe&idSite=1&period=year&date=2012-08-09&moduleToWidgetize=API&actionToWidgetize=index&method=SitesManager.getImageTrackingCode&piwikUrl=test

       Generated screenshot: /home/travis/build/piwik/piwik/tests/UI/processed-ui-screenshots/UIIntegrationTest_widgetize_apidisallowed.png

       Expected screenshot: /home/travis/build/piwik/piwik/tests/UI/expected-ui-screenshots/UIIntegrationTest_widgetize_apidisallowed.png



  2) UIIntegrationTest should fail correctly when db information in config is incorrect:

     Processed screenshot does not match expected for UIIntegrationTest_db_connect_error.png (1187px difference)

       Url to reproduce: http://localhost/tests/PHPUnit/proxy/

       Generated screenshot: /home/travis/build/piwik/piwik/tests/UI/processed-ui-screenshots/UIIntegrationTest_db_connect_error.png

       Expected screenshot: /home/travis/build/piwik/piwik/tests/UI/expected-ui-screenshots/UIIntegrationTest_db_connect_error.png

@tsteur tsteur added the not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org. label Sep 21, 2015
@tsteur tsteur added this to the 2.15.0 milestone Sep 21, 2015
tsteur added a commit that referenced this pull request Sep 21, 2015
@tsteur
Merge pull request #8831 from Joey3000/removeLoginLink
80a7817 
Remove Login link from error page
@tsteur tsteur merged commit 80a7817 into matomo-org:master Sep 21, 2015
@Joey3000 Joey3000 deleted the removeLoginLink branch September 21, 2015 15:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
not-in-changelog For issues or pull requests that should not be included in our release changelog on matomo.org.
Projects
None yet
Milestone
2.15.0
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Joey3000 @tsteur