Test fixes for session/parsedown changes, jquery update, quark defaul…

…t theme
getgrav · Mar 9, 2018 · cad10b6 · cad10b6
1 parent 7aa930c
commit cad10b6
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 77 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,5 @@
-# v1.4.0-rc.3
-## mm/dd/2018
+# v1.4.0
+## 03/09/2018
 
 1. [](#new)
     * Added `Grav\Framework\Uri` classes extending PSR-7 `HTTP message UriInterface` implementation
@@ -10,93 +10,54 @@
     * Added new `{% switch %}` twig tag for more elegant if statements
     * Added new `{% markdown %}` twig tag
     * Added **Route Overrides** to the default page blueprint
-1. [](#improved)
-    * Vendor library updated to latest  
-    * Improved `Session` initialization
-    * Added ability to set a `theme_var()` option in page frontmatter
-    * Force clearing PHP `clearstatcache` and `opcache-reset` on `Cache::clear()`
-1. [](#bugfix) 
-    * Fixed issue with image alt tag always getting empted out unless set in markdown
-    * Fixed issue with remote PHP version determination for Grav updates [#1883](https://github.com/getgrav/grav/issues/1883)
-
-# v1.4.0-rc.2
-## 02/15/2018
-
-1. [](#new)
     * Added new `Collection::toExtendedArray()` method that's particularly useful for Json output of data
     * Added new `|yaml_encode` and `|yaml_decode` Twig filter to convert to and from YAML
     * Added new `read_file()` Twig function to allow you to load and display a file in Twig (Supports streams and regular paths)
     * Added a new `Medium::exists()` method to check for file existence
+    * Moved Twig `urlFunc()` to `Utils::url()` as its so darn handy
+    * Transferred overall copyright from RocketTheme, LLC, to Trilby Media LLC
+    * Added `theme_var`, `header_var` and `body_class` Twig functions for themes
+    * Added `Grav\Framework\Cache` classes providing PSR-16 `Simple Cache` implementation
+    * Added `Grav\Framework\ContentBlock` classes for nested HTML blocks with CSS/JS assets
+    * Added `Grav\Framework\Object` classes for creating collections of objects
+    * Added `|nicenumber` Twig filter
+    * Added `{% try %} ... {% catch %} Error: {{ e.message }} {% endcatch %}` tag to allow basic exception handling inside Twig
+    * Added `{% script %}` and `{% style %}` tags for Twig templates
+    * Deprecated GravTrait
 1. [](#improved)
+    * Improved `Session` initialization
+    * Added ability to set a `theme_var()` option in page frontmatter
+    * Force clearing PHP `clearstatcache` and `opcache-reset` on `Cache::clear()`
     * Better `Page.collection()` filtering support including ability to have non-published pages in collections
     * Stopped Chrome from auto-completing admin user profile form [#1847](https://github.com/getgrav/grav/issues/1847)
     * Support for empty `switch` field like a `checkbox`
-1. [](#bugfix) 
-    * Properly validate YAML blueprint fields so admin can save as proper YAML now  [addresses many issues]   
-    * Fixed OpenGraph metatags so only Twitter uses `name=`, and all others use `property=` [#1849](https://github.com/getgrav/grav/issues/1849)
-    * Fixed an issue with `evaluate()` and `evaluate_twig()` Twig functions that throws invalid template error
-    * Fixed issue with `|sort_by_key` twig filter if the input was null or not an array
-
-# v1.4.0-rc.1
-## 01/22/2018
-
-1. [](#new)
-    * Moved Twig `urlFunc()` to `Utils::url()` as its so darn handy
-1. [](#improved)
     * Made `modular` blueprint more flexible
     * Code optimizations to `Utils` class [#1830](https://github.com/getgrav/grav/pull/1830)
     * Objects: Add protected function `getElement()` to get serialized value for a single property
     * `ObjectPropertyTrait`: Added protected functions `isPropertyLoaded()`, `offsetLoad()`, `offsetPrepare()` and `offsetSerialize()`    
     * `Grav\Framework\Cache`: Allow unlimited TTL
     * Optimizations & refactoring to the test suite [#1779](https://github.com/getgrav/grav/pull/1779)
     * Slight modification of Whoops error colors
-    * Updated vendor libs to latest
-1. [](#bugfix)
-    * Date ordering should always be numeric [#1810](https://github.com/getgrav/grav/issues/1810)
-
-# v1.4.0-beta.3
-## 12/29/2017
-
-1. [](#bugfix)
-    * Fix for base paths containing special characters [#1799](https://github.com/getgrav/grav/issues/1799)
-    * Fix for session cookies in paths containing special characters
-    * Fix for `vundefined` error for version numbers in GPM [form#222](https://github.com/getgrav/grav-plugin-form/issues/222)
-1. [](#improved)
     * Added new configuration option `system.session.initialize` to delay session initialization if needed by a plugin
-
-# v1.4.0-beta.2
-## 12/18/2017
-
-1. [](#new)
-    * Transferred overall copyright from RocketTheme, LLC, to Trilby Media LLC
-    * Added `theme_var`, `header_var` and `body_class` Twig functions for themes
-1. [](#improved)
+    * Vendor library updated to latest 
     * Updated vendor libraries to latest versions
     * Removed constructor from `ObjectInterface`
-1. [](#bugfix)
-    * Fixed `BadMethodCallException` thrown in GPM updates [#1784](https://github.com/getgrav/grav/issues/1784)
-
-# v1.4.0-beta.1
-## 12/11/2017
-
-1. [](#new)
-    * Added `Grav\Framework\Cache` classes providing PSR-16 `Simple Cache` implementation
-    * Added `Grav\Framework\ContentBlock` classes for nested HTML blocks with CSS/JS assets
-    * Added `Grav\Framework\Object` classes for creating collections of objects
-    * Added `|nicenumber` Twig filter
-    * Added `{% try %} ... {% catch %} Error: {{ e.message }} {% endcatch %}` tag to allow basic exception handling inside Twig
-    * Added `{% script %}` and `{% style %}` tags for Twig templates
-    * Deprecated GravTrait
-1. [](#improved)
     * Make it possible to include debug bar also into non-HTML responses
-
-# v1.3.11
-## mm/dd/2017
-
-1. [](#improved)
-    * Updated vendor libraries to latest
-1. [](#bugfix)
+    * Updated built-in JQuery to latest 3.3.1
+1. [](#bugfix) 
+    * Fixed issue with image alt tag always getting empted out unless set in markdown
+    * Fixed issue with remote PHP version determination for Grav updates [#1883](https://github.com/getgrav/grav/issues/1883)
     * Fixed issue with _illegal scheme offset_ in `Uri::convertUrl()` [page-inject#8](https://github.com/getgrav/grav-plugin-page-inject/issues/8)
+    * Properly validate YAML blueprint fields so admin can save as proper YAML now  [addresses many issues]   
+    * Fixed OpenGraph metatags so only Twitter uses `name=`, and all others use `property=` [#1849](https://github.com/getgrav/grav/issues/1849)
+    * Fixed an issue with `evaluate()` and `evaluate_twig()` Twig functions that throws invalid template error
+    * Fixed issue with `|sort_by_key` twig filter if the input was null or not an array
+    * Date ordering should always be numeric [#1810](https://github.com/getgrav/grav/issues/1810)
+    * Fix for base paths containing special characters [#1799](https://github.com/getgrav/grav/issues/1799)
+    * Fix for session cookies in paths containing special characters
+    * Fix for `vundefined` error for version numbers in GPM [form#222](https://github.com/getgrav/grav-plugin-form/issues/222)
+    * Fixed `BadMethodCallException` thrown in GPM updates [#1784](https://github.com/getgrav/grav/issues/1784)
+    * NOTE: Parsedown security release now escapes `&` to `&amp;` in Markdown links
 
 # v1.3.10
 ## 12/06/2017

diff --git a/system/assets/jquery/jquery-3.x.min.js b/system/assets/jquery/jquery-3.x.min.js
diff --git a/system/config/system.yaml b/system/config/system.yaml
@@ -25,7 +25,7 @@ home:
   hide_in_urls: false                            # Hide the home route in URLs
 
 pages:
-  theme: antimatter                              # Default theme (defaults to "antimatter" theme)
+  theme: quark                                   # Default theme (defaults to "quark" theme)
   order:
     by: default                                  # Order pages by "default", "alpha" or "date"
     dir: asc                                     # Default ordering direction, "asc" or "desc"

diff --git a/tests/unit/Grav/Common/Markdown/ParsedownTest.php b/tests/unit/Grav/Common/Markdown/ParsedownTest.php
@@ -315,7 +315,7 @@ public function testExternalLinks()
             $this->parsedown->text('[cnn.com](http://www.cnn.com)'));
         $this->assertSame('<p><a href="https://www.google.com">google.com</a></p>',
             $this->parsedown->text('[google.com](https://www.google.com)'));
-        $this->assertSame('<p><a href="https://github.com/getgrav/grav/issues/new?title=%5Badd-resource%5D%20New%20Plugin%2FTheme&body=Hello%20%2A%2AThere%2A%2A">complex url</a></p>',
+        $this->assertSame('<p><a href="https://github.com/getgrav/grav/issues/new?title=%5Badd-resource%5D%20New%20Plugin%2FTheme&amp;body=Hello%20%2A%2AThere%2A%2A">complex url</a></p>',
             $this->parsedown->text('[complex url](https://github.com/getgrav/grav/issues/new?title=[add-resource]%20New%20Plugin/Theme&body=Hello%20**There**)'));
     }
 
@@ -689,7 +689,7 @@ public function testAttributeLinks()
             $this->parsedown->text('[Relative Target](../item2-3?target=_blank)'));
         $this->assertSame('<p><a href="/item2/item2-3" rel="nofollow">Relative Rel</a></p>',
             $this->parsedown->text('[Relative Rel](../item2-3?rel=nofollow)'));
-        $this->assertSame('<p><a href="/item2/item2-3?foo=bar&baz=qux" rel="nofollow" class="button">Relative Mixed</a></p>',
+        $this->assertSame('<p><a href="/item2/item2-3?foo=bar&amp;baz=qux" rel="nofollow" class="button">Relative Mixed</a></p>',
             $this->parsedown->text('[Relative Mixed](../item2-3?foo=bar&baz=qux&rel=nofollow&class=button)'));
     }
 

diff --git a/user/config/system.yaml b/user/config/system.yaml
@@ -41,5 +41,5 @@ debugger:
   shutdown:
     close_connection: true
 gpm:
-  releases: testing
+  releases: stable
   verify_peer: true