Merge pull request #195 from qld-gov-au/develop

Merge develop in master

ckanext/data_qld_theme/templates/header.html

@@ -73,14 +73,13 @@
       <span class="sr-only">Open/Close Mobile Menu</span>
     </button>
     <hgroup class="header-image pull-left">
-      <a
-        class="logo"
-        href="https://www.qld.gov.au"
-        title="Link to Queensland Gov website"
-      >
-
-      <img src="https://www.data.qld.gov.au/__data/assets/file/0014/100832/qld-gov-open-data-logo.svg" height="37px" alt="Queensland Government">
-
+      <!--
+                <img src="https://www.data.qld.gov.au/__data/assets/file/0014/100832/qld-gov-open-data-logo.svg" height="37px" alt="Queensland Government">
+      -->
+      <a class="logo" href="https://www.qld.gov.au" title="Link to Queensland Gov website">
+        <img src="https://www.data.qld.gov.au/__data/assets/file/0035/218789/qg-coa-white.svg" alt="Queensland Government" class="hidden-xs">
+        <img src="https://www.data.qld.gov.au/__data/assets/file/0027/218790/qg-coa-stacked-white.svg" alt="Queensland Government" class="hidden-sm hidden-md hidden-lg">
+        <img src="https://www.data.qld.gov.au/__data/assets/file/0028/218791/qg-coa-stacked.svg" alt="Queensland Government" class="hidden-xs hidden-sm hidden-md hidden-lg qg-print-coat-of-arms">
       </a>
       <div class="header__data-portal">
         <a href="/">Open Data Portal</a>

requirements-dev.txt

@@ -11,9 +11,9 @@ git+https://github.com/ckan/[email protected]#egg=ckantoolkit
 -e git+https://github.com/frictionlessdata/ckanext-validation.git#egg=ckanext-validation
 -e git+https://github.com/qld-gov-au/[email protected]#egg=ckanext-qgov
 -e git+https://github.com/qld-gov-au/[email protected]#egg=ckanext-archiver
--e git+https://github.com/qld-gov-au/ckanext-data-qld.git@develop#egg=ckanext-data-qld
+-e git+https://github.com/qld-gov-au/ckanext-data-qld.git@4.0.0#egg=ckanext-data-qld
 -e git+https://github.com/qld-gov-au/[email protected]#egg=ckanext-datarequests
 -e git+https://github.com/qld-gov-au/[email protected]#egg=ckanext-qa
 -e git+https://github.com/qld-gov-au/[email protected]#egg=ckanext-report
--e git+https://github.com/qld-gov-au/ckanext-ytp-comments.git@2.3.0-qgov#egg=ckanext-ytp-comments
+-e git+https://github.com/qld-gov-au/ckanext-ytp-comments.git@2.4.0-qgov#egg=ckanext-ytp-comments
 

test/features/comments.feature

@@ -90,7 +90,7 @@ Feature: Comments
         Then I should see "This is a reply" within 10 seconds
 
     @comment-delete
-    Scenario: When an Org Admin visits a dataset belonging to their organisation, they can delete a comment and should not see text 'This comment was deleted.'
+    Scenario: When an Org Admin visits a dataset belonging to their organisation, they can delete a comment and should see deletion text for the user responsible.
         Given "TestOrgAdmin" as the persona
         When I log in
         Then I go to dataset "warandpeace" comments
@@ -99,18 +99,18 @@ Feature: Comments
         Then I press the element with xpath "//button[contains(string(), 'Confirm')]"
         Then I take a screenshot
         Then I should not see "This comment was deleted." within 2 seconds
-        And I should see "Comment deleted by test_org_admin." within 2 seconds
+        And I should see "Comment deleted by Test Admin." within 2 seconds
 
     @comment-delete @datarequest
-    Scenario: When an Org Admin visits a data request belonging to their organisation, they can delete a comment and should not see text 'This comment was deleted.'
+    Scenario: When an Org Admin visits a data request belonging to their organisation, they can delete a comment and should see deletion text for the user responsible.
         Given "TestOrgAdmin" as the persona
         When I log in
         And I go to data request "Test Request" comments
         And I press the element with xpath "//a[@title='Delete comment']"
         Then I should see "Are you sure you want to delete this comment?" within 1 seconds
         Then I press the element with xpath "//button[contains(string(), 'Confirm')]"
         Then I should not see "This comment was deleted." within 2 seconds
-        And I should see "Comment deleted by test_org_admin." within 2 seconds
+        And I should see "Comment deleted by Test Admin." within 2 seconds
 
     @comment-tab
     Scenario: Non-logged in users should not see comment form in dataset tab