Merge pull request #2098 from pantheon-systems/plan

[BUGS-3082] Bugfix for plan:info command, the site object was not set resulting i…
pantheon-systems · Oct 30, 2020 · a1188b2 · a1188b2
2 parents 08fda0d + d21f213
commit a1188b2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/Models/Plan.php b/src/Models/Plan.php
@@ -28,6 +28,9 @@ public function __construct($attributes = null, array $options = [])
             $attributes = (object)$attributes->attributes;
         }
         parent::__construct($attributes, $options);
+        if (isset($options['site'])) {
+            $this->setSite($options['site']);
+        }
     }
 
     /**

diff --git a/tests/unit_tests/Commands/Plan/ListCommandTest.php b/tests/unit_tests/Commands/Plan/ListCommandTest.php
@@ -23,7 +23,7 @@ public function testListPlans()
             ['id' => 'master', 'sku' => 'xxx'],
             ['id' => 'another', 'sku' => 'yyy'],
         ];
-        
+
         $plans_collection = $this->getMockBuilder(Plans::class)
             ->disableOriginalConstructor()
             ->getMock();

diff --git a/tests/unit_tests/Models/PlanTest.php b/tests/unit_tests/Models/PlanTest.php
@@ -3,6 +3,7 @@
 namespace Pantheon\Terminus\UnitTests\Models;
 
 use Pantheon\Terminus\Collections\Plans;
+use Pantheon\Terminus\Models\Site;
 use Pantheon\Terminus\Models\Plan;
 
 /**
@@ -30,6 +31,9 @@ public function setUp()
         $this->plans = $this->getMockBuilder(Plans::class)
             ->disableOriginalConstructor()
             ->getMock();
+        $this->site = $this->getMockBuilder(Site::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->data = [
             'monthly_collection' => [
                 'attributes' => [
@@ -203,7 +207,7 @@ public function testSerialize()
      */
     protected function makePlan(array $attributes = [])
     {
-        $model = new Plan((object)$attributes, ['collection' => $this->plans,]);
+        $model = new Plan((object)$attributes, ['collection' => $this->plans,'site' => $this->site,]);
         $model->setConfig($this->config);
         $model->setRequest($this->request);
         return $model;