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

Integration of 1.13.6 into 7.x-1.x #2041

Closed
wants to merge 23 commits into from
Closed

Integration of 1.13.6 into 7.x-1.x #2041

wants to merge 23 commits into from

Conversation

ghost
Copy link

@ghost ghost commented Aug 1, 2017

Issue: None

Description

This PR was created to add all the changes from 1.13.6 into 7.x-1.x

QA Steps

  • Automatic tests should pass.
  • A general manual QA is recommended.

dafeder and others added 18 commits July 14, 2017 14:57
* 1.13.5 release notes (#2009)

* 1.13.5 Release notes.

* Clean up CHANGELOG

* Couple more changleog corrections/

* Last minute fixes

* Add custom filelds and test tags.

* Allow skipping of some tests.
* Add custom fields.

* Reconcile PR1943 with the 1.13.5 release

* Remove changes on user.admin.feature

* code review on .ht.router.php

* Fix user.admin.feature

* Add BeforeSuite file shiv.

REF CIVIC-6610

When stage file proxy is enabled we need to make sure some required files are present in public://
By adding a BeforeSuite step that copies these files from a site to the local
environment, we fix errors that arise from files not being present in the
testing environment.

* Docker Local Environment Updates (#1955)

* Docker fix for mysql args

* Changes from docker-machine to docker, fixed uli

* Added 'ahoy docker hostfile' to add to /etc/hosts

* Make backwards compatible with docker-machine.

* Make backwards compatible with docker-machine.

Missed this one.

* Add dkan-uli.rb script.

Will handle function for `ahoy dkan uli`.

* Move uli command back to dkan.ahoy.yml

* Update CHANGELOG.

* Remove .ahoy.yml uli command.

Backports #1955 into 1.13.5

* Remove CHANGELOG updates.

* Remove CHANGELOG changes.

* Revert "Remove CHANGELOG changes."

This reverts commit 108d7c2.

* Revert "Remove CHANGELOG updates."

This reverts commit 3b02c2a.

* Release notes for 1.13.6
* Module updates: File Entity, Media, Panpopoly, Search API

* Update test for new version of Panopoly Widgets

* Revert "Update test for new version of Panopoly Widgets"

This reverts commit 606f5c7.

* Remove panopoly updates
* Add unique tags to test scenarios

* Remove update not in the release patch
* Added upgrade hook

* Update CHANGELOG.txt

* Updated chosen_jquery_selector config on dkan_dataset_content_types

* Update CHANGELOG.txt
* Add configurable arguments via Behat Contexts.

REF CIVIC-6614

By passing Context Attributes via configuration we have the option of overriding
them for custom settings and test environments.

* Fix Ruby YAML does not like unquoted % token.

* Update tests.

* Add fields to ServiceContext. Fix typo in dataset key

* Fix behat.yml services params.

* Load Dataset context froom ServicesContext via Factory.

* Fix datasetContext not available form ServicesContext.

* Reformat behat.yml and fix PODContext URL.
* Changed dataset field on resource form to be autocomplete

* Fixed code style errors

* Fixed automatic reference to datasets

* Update CHANGELOG.txt

* Update dkan_dataset.forms.inc

* Refactored step used to fill in autocomplete fields

* Fixed tests

* Removed unused step

* Added javascript tagas

* Fixed tests
@@ -73,8 +73,6 @@ Feature: User
And I press "Create new account"
Then I should see "Created a new user account for tempuser."
When I am on "Users" page
And I fill in "edit-name" with "tempuser"
Copy link
Member

Choose a reason for hiding this comment

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

Why are we removing this? This is needed for sites with lots of users, the test will fail since tempuser will be on the last page of users and not visible unless you filter for them.

Copy link
Author

Choose a reason for hiding this comment

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

Thanks for this! I got a conflict there and I was not sure about which change was the correct one. I already fixed this. Thanks!

@ghost
Copy link
Author

ghost commented Aug 9, 2017

Closed in favor of: #2051

This pull request was closed.
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