Merge pull request phalcon#14848 from les-enovateurs/update_assets_co…

…llection phalcon#13655 - Assets/Collection - Tests finished. Thank you @jenovateurs
NeftaliYagua · Feb 15, 2020 · 8d90816 · 8d90816
2 parents 2289774 + 708788a
commit 8d90816
Show file tree

Hide file tree

Showing 52 changed files with 754 additions and 840 deletions.
diff --git a/CHANGELOG-4.0.md b/CHANGELOG-4.0.md
@@ -12,6 +12,7 @@
 - Fixed `Phalcon\Db\Dialect\Mysql::createTable()` to create default value with CURRENT_TIMESTAMP ON UPDATE/DELETE [#14797]
 - Fixed `Phalcon\Storage\Adapter\*` to no longer accept the `serializer` option as it was clashing with the factory [#14828](https://github.com/phalcon/cphalcon/pull/14828)
 - Fixed `Phalcon\Http\Request` to return the correct host on an `UnexpectedValueException` [#14763](https://github.com/phalcon/cphalcon/issues/14763)
+- Fixed `Phalcon\Assets\Collection` to initialize `position` to 0 [#14848](https://github.com/phalcon/cphalcon/pull/14848)
 
 # [4.0.3](https://github.com/phalcon/cphalcon/releases/tag/v4.0.3) (2020-01-25)
 ## Added

diff --git a/phalcon/Assets/Collection.zep b/phalcon/Assets/Collection.zep
@@ -71,7 +71,7 @@ class Collection implements Countable, Iterator
     /**
      * @var int
      */
-    protected position { get };
+    protected position = 0 { get };
 
     /**
      * @var string

diff --git a/tests/unit/Assets/Collection/AddCssCest.php b/tests/unit/Assets/Collection/AddCssCest.php
@@ -13,20 +13,38 @@
 
 namespace Phalcon\Test\Unit\Assets\Collection;
 
+use Phalcon\Assets\Collection;
 use UnitTester;
 
 class AddCssCest
 {
     /**
      * Tests Phalcon\Assets\Collection :: addCss()
      *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
+     * @author Jeremy PASTOURET <https://github.com/jenovateurs>
+     * @since  2020-02-06
      */
     public function assetsCollectionAddCss(UnitTester $I)
     {
         $I->wantToTest('Assets\Collection - addCss()');
 
-        $I->skipTest('Need implementation');
+        $collection = new Collection();
+
+        $collection->addCss(
+            'css/docs.css'
+        );
+
+        $collection->addCss(
+            'https://assets.phalcon.io/phalcon/css/core.css'
+        );
+
+        foreach ($collection as $asset) {
+            $I->assertEquals(
+                'css',
+                $asset->getType()
+            );
+        }
+
+        $I->assertCount(2, $collection);
     }
 }
diff --git a/tests/unit/Assets/Collection/AddFilterCest.php b/tests/unit/Assets/Collection/AddFilterCest.php
@@ -13,20 +13,41 @@
 
 namespace Phalcon\Test\Unit\Assets\Collection;
 
+use Phalcon\Assets\Collection;
+use Phalcon\Assets\Filters\None;
 use UnitTester;
 
 class AddFilterCest
 {
     /**
      * Tests Phalcon\Assets\Collection :: addFilter()
      *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
+     * @author Jeremy PASTOURET <https://github.com/jenovateurs>
+     * @since  2020-02-06
      */
     public function assetsCollectionAddFilter(UnitTester $I)
     {
         $I->wantToTest('Assets\Collection - addFilter()');
 
-        $I->skipTest('Need implementation');
+        $collection = new Collection();
+
+        $collection->addFilter(
+            new None()
+        );
+
+        $collection->addFilter(
+            new None()
+        );
+
+        $filters = $collection->getFilters();
+
+        foreach ($filters as $filter) {
+            $I->assertInstanceOf(
+                None::class,
+                $filter
+            );
+        }
+
+        $I->assertCount(2, $filters);
     }
 }
diff --git a/tests/unit/Assets/Collection/AddInlineCest.php b/tests/unit/Assets/Collection/AddInlineCest.php
@@ -13,20 +13,37 @@
 
 namespace Phalcon\Test\Unit\Assets\Collection;
 
+use Phalcon\Assets\Collection;
+use Phalcon\Assets\Inline;
 use UnitTester;
 
 class AddInlineCest
 {
     /**
      * Tests Phalcon\Assets\Collection :: addInline()
      *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
+     * @author Jeremy PASTOURET <https://github.com/jenovateurs>
+     * @since  2020-02-06
      */
     public function assetsCollectionAddInline(UnitTester $I)
     {
         $I->wantToTest('Assets\Collection - addInline()');
 
-        $I->skipTest('Need implementation');
+        $collection = new Collection();
+
+        $inline = new Inline("js", "alert('an amazing test');");
+
+        $collection->addInline(
+            $inline
+        );
+
+        $codes = $collection->getCodes();
+
+        $I->assertCount(1, $collection->getCodes());
+
+        $I->assertEquals(
+            end($codes),
+            $inline
+        );
     }
 }
diff --git a/tests/unit/Assets/Collection/AddInlineCssCest.php b/tests/unit/Assets/Collection/AddInlineCssCest.php
@@ -13,20 +13,37 @@
 
 namespace Phalcon\Test\Unit\Assets\Collection;
 
+use Phalcon\Assets\Collection;
+use Phalcon\Assets\Inline\Css;
 use UnitTester;
 
 class AddInlineCssCest
 {
     /**
      * Tests Phalcon\Assets\Collection :: addInlineCss()
      *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
+     * @author Jeremy PASTOURET <https://github.com/jenovateurs>
+     * @since  2020-02-06
      */
     public function assetsCollectionAddInlineCss(UnitTester $I)
     {
         $I->wantToTest('Assets\Collection - addInlineCss()');
 
-        $I->skipTest('Need implementation');
+        $collection = new Collection();
+
+        $inline = new Css(".awesome{color: #8fc6bc}");
+
+        $collection->addInline(
+            $inline
+        );
+
+        $codes = $collection->getCodes();
+
+        $I->assertCount(1, $collection->getCodes());
+
+        $I->assertEquals(
+            end($codes),
+            $inline
+        );
     }
 }
diff --git a/tests/unit/Assets/Collection/AddInlineJsCest.php b/tests/unit/Assets/Collection/AddInlineJsCest.php
@@ -13,20 +13,37 @@
 
 namespace Phalcon\Test\Unit\Assets\Collection;
 
+use Phalcon\Assets\Collection;
+use Phalcon\Assets\Inline\Js;
 use UnitTester;
 
 class AddInlineJsCest
 {
     /**
      * Tests Phalcon\Assets\Collection :: addInlineJs()
      *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
+     * @author Jeremy PASTOURET <https://github.com/jenovateurs>
+     * @since  2020-02-06
      */
     public function assetsCollectionAddInlineJs(UnitTester $I)
     {
         $I->wantToTest('Assets\Collection - addInlineJs()');
 
-        $I->skipTest('Need implementation');
+        $collection = new Collection();
+
+        $inline = new Js("alert('an amazing test');");
+
+        $collection->addInline(
+            $inline
+        );
+
+        $codes = $collection->getCodes();
+
+        $I->assertCount(1, $collection->getCodes());
+
+        $I->assertEquals(
+            end($codes),
+            $inline
+        );
     }
 }
diff --git a/tests/unit/Assets/Collection/AddJsCest.php b/tests/unit/Assets/Collection/AddJsCest.php
@@ -13,20 +13,38 @@
 
 namespace Phalcon\Test\Unit\Assets\Collection;
 
+use Phalcon\Assets\Collection;
 use UnitTester;
 
 class AddJsCest
 {
     /**
      * Tests Phalcon\Assets\Collection :: addJs()
      *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
+     * @author Jeremy PASTOURET <https://github.com/jenovateurs>
+     * @since  2020-02-06
      */
     public function assetsCollectionAddJs(UnitTester $I)
     {
         $I->wantToTest('Assets\Collection - addJs()');
 
-        $I->skipTest('Need implementation');
+        $collection = new Collection();
+
+        $collection->addJs(
+            'js/jquery.css'
+        );
+
+        $collection->addJs(
+            'https://assets.phalcon.io/phalcon/js/core.js'
+        );
+
+        foreach ($collection as $asset) {
+            $I->assertEquals(
+                'js',
+                $asset->getType()
+            );
+        }
+
+        $I->assertCount(2, $collection);
     }
 }
diff --git a/tests/unit/Assets/Collection/CountCest.php b/tests/unit/Assets/Collection/CountCest.php
@@ -13,20 +13,42 @@
 
 namespace Phalcon\Test\Unit\Assets\Collection;
 
+use Phalcon\Assets\Collection;
 use UnitTester;
 
 class CountCest
 {
     /**
      * Tests Phalcon\Assets\Collection :: count()
      *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
+     * @author Jeremy PASTOURET <https://github.com/jenovateurs>
+     * @since  2020-02-06
      */
     public function assetsCollectionCount(UnitTester $I)
     {
         $I->wantToTest('Assets\Collection - count()');
 
-        $I->skipTest('Need implementation');
+        $collection = new Collection();
+
+        $collection->addCss(
+            'css/docs.css'
+        );
+
+        $collection->addCss(
+            'https://assets.phalcon.io/phalcon/css/core.css'
+        );
+
+        $collection->addJs(
+            'js/jquery.css'
+        );
+
+        $collection->addJs(
+            'https://assets.phalcon.io/phalcon/js/core.js'
+        );
+
+        $I->assertEquals(
+            4,
+            $collection->count()
+        );
     }
 }
diff --git a/tests/unit/Assets/Collection/CurrentCest.php b/tests/unit/Assets/Collection/CurrentCest.php
@@ -13,20 +13,41 @@
 
 namespace Phalcon\Test\Unit\Assets\Collection;
 
+use Phalcon\Assets\Asset;
+use Phalcon\Assets\Collection;
 use UnitTester;
 
 class CurrentCest
 {
     /**
      * Tests Phalcon\Assets\Collection :: current()
      *
-     * @author Phalcon Team <team@phalcon.io>
-     * @since  2018-11-13
+     * @author Jeremy PASTOURET <https://github.com/jenovateurs>
+     * @since  2020-02-06
      */
     public function assetsCollectionCurrent(UnitTester $I)
     {
         $I->wantToTest('Assets\Collection - current()');
 
-        $I->skipTest('Need implementation');
+        $collection = new Collection();
+
+        $asset = new Asset('js', 'js/jquery.js');
+
+        $collection->add(
+            $asset
+        );
+
+        $asset1 = new Asset('js', 'js/jquery-ui.js');
+
+        $collection->add(
+            $asset1
+        );
+
+        // ERROR TO FIX IN PHALCON Undefined index:  in phalcon/Assets/Collection.zep on line 261
+        $I->assertEquals($asset, $collection->current());
+
+        $collection->next();
+
+        $I->assertEquals($asset1, $collection->current());
     }
 }