Inspection of "Update composer.json" - dynamic/foxystripe - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — 2 ( 18ff94...35f095 )

by Jason

created 2018-09-21 19:58 UTC

Status

Indentation +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -2,30 +2,30 @@
 block discarded – undo
 
 class StoreSettingsTest extends FS_Test{
 
-	protected static $use_draft_site = true;
+    protected static $use_draft_site = true;
 
-	function setUp(){
-		parent::setUp();
+    function setUp(){
+        parent::setUp();
 
-		$siteConf = SiteConfig::current_site_config();
-		$siteConf->StoreName = 'foxystripe';
+        $siteConf = SiteConfig::current_site_config();
+        $siteConf->StoreName = 'foxystripe';
         $siteConf->requireDefaultRecords();
-		$siteConf->write();
-	}
+        $siteConf->write();
+    }
 
-	function testStoreKey(){
-		$pref = FoxyCart::getKeyPrefix();
-		$siteConf = SiteConfig::current_site_config();
+    function testStoreKey(){
+        $pref = FoxyCart::getKeyPrefix();
+        $siteConf = SiteConfig::current_site_config();
 
-		$this->assertTrue(ctype_alnum($siteConf->StoreKey));
+        $this->assertTrue(ctype_alnum($siteConf->StoreKey));
         $this->assertEquals(strlen($siteConf->StoreKey), 60);
         $this->assertEquals(substr($siteConf->StoreKey, 0, 6), $pref);
-	}
+    }
 
-	function testStoreName(){
-		$siteConf = SiteConfig::current_site_config();
+    function testStoreName(){
+        $siteConf = SiteConfig::current_site_config();
 
         $this->assertEquals($siteConf->StoreName, 'foxystripe');
-	}
+    }
 
 }

Please login to merge, or discard this patch.

tests/ProductPageTest.php 1 patch

Indentation +145 added lines, -145 removed lines patch added patch discarded remove patch

@@ -2,242 +2,242 @@
 block discarded – undo
 
 class ProductPageTest extends FS_Test{
 
-	protected static $use_draft_site = true;
+    protected static $use_draft_site = true;
 
-	function setUp(){
-		parent::setUp();
+    function setUp(){
+        parent::setUp();
 
-		$groupForItem = OptionGroup::create();
-		$groupForItem->Title = 'Sample-Group';
-		$groupForItem->write();
+        $groupForItem = OptionGroup::create();
+        $groupForItem->Title = 'Sample-Group';
+        $groupForItem->write();
 
-		/*$productHolder = ProductHolder::create();
+        /*$productHolder = ProductHolder::create();
 		$productHolder->Title = 'Product Holder';
 		$productHolder->write();*/
-	}
+    }
 
-	function testProductCreation(){
+    function testProductCreation(){
 
-		$this->logInWithPermission('Product_CANCRUD');
-		$default = $this->objFromFixture('ProductCategory', 'default');
-		$holder = $this->objFromFixture('ProductHolder', 'default');
-		$product1 = $this->objFromFixture('ProductPage', 'product1');
+        $this->logInWithPermission('Product_CANCRUD');
+        $default = $this->objFromFixture('ProductCategory', 'default');
+        $holder = $this->objFromFixture('ProductHolder', 'default');
+        $product1 = $this->objFromFixture('ProductPage', 'product1');
 
-		$product1->doPublish();
-		$this->assertTrue($product1->isPublished());
+        $product1->doPublish();
+        $this->assertTrue($product1->isPublished());
 
-	}
+    }
 
-	function testProductDeletion(){
+    function testProductDeletion(){
 
-		$this->logInWithPermission('Product_CANCRUD');
-		$holder = $this->objFromFixture('ProductHolder', 'default');
-		$holder->doPublish();
-		$product2 = $this->objFromFixture('ProductPage', 'product2');
-		$productID = $product2->ID;
+        $this->logInWithPermission('Product_CANCRUD');
+        $holder = $this->objFromFixture('ProductHolder', 'default');
+        $holder->doPublish();
+        $product2 = $this->objFromFixture('ProductPage', 'product2');
+        $productID = $product2->ID;
 
-		$product2->doPublish();
-		$this->assertTrue($product2->isPublished());
+        $product2->doPublish();
+        $this->assertTrue($product2->isPublished());
 
-		$versions = DB::query('Select * FROM "ProductPage_versions" WHERE "RecordID" = '. $productID);
-		$versionsPostPublish = array();
-		foreach($versions as $versionRow) $versionsPostPublish[] = $versionRow;
+        $versions = DB::query('Select * FROM "ProductPage_versions" WHERE "RecordID" = '. $productID);
+        $versionsPostPublish = array();
+        foreach($versions as $versionRow) $versionsPostPublish[] = $versionRow;
 
-		$product2->delete();
-		$this->assertTrue(!$product2->isPublished());
+        $product2->delete();
+        $this->assertTrue(!$product2->isPublished());
 
-		$versions = DB::query('Select * FROM "ProductPage_versions" WHERE "RecordID" = '. $productID);
-		$versionsPostDelete = array();
-		foreach($versions as $versionRow) $versionsPostDelete[] = $versionRow;
+        $versions = DB::query('Select * FROM "ProductPage_versions" WHERE "RecordID" = '. $productID);
+        $versionsPostDelete = array();
+        foreach($versions as $versionRow) $versionsPostDelete[] = $versionRow;
 
-		$this->assertTrue($versionsPostPublish == $versionsPostDelete);
+        $this->assertTrue($versionsPostPublish == $versionsPostDelete);
 
-	}
+    }
 
-	function testProductTitleLeadingWhiteSpace(){
+    function testProductTitleLeadingWhiteSpace(){
 
-		$this->logInWithPermission('ADMIN');
+        $this->logInWithPermission('ADMIN');
 
-		$holder = $this->objFromFixture('ProductHolder', 'default');
-		$holder->doPublish();
+        $holder = $this->objFromFixture('ProductHolder', 'default');
+        $holder->doPublish();
 
-		$product = $this->objFromFixture('ProductPage', 'product1');
-		$product->Title = " Test with leading space";
-		$product->doPublish();
+        $product = $this->objFromFixture('ProductPage', 'product1');
+        $product->Title = " Test with leading space";
+        $product->doPublish();
 
-		$this->assertTrue($product->Title == 'Test with leading space');
+        $this->assertTrue($product->Title == 'Test with leading space');
 
-	}
+    }
 
-	function testProductTitleTrailingWhiteSpace(){
+    function testProductTitleTrailingWhiteSpace(){
 
-		$this->logInWithPermission('ADMIN');
+        $this->logInWithPermission('ADMIN');
 
-		$holder = $this->objFromFixture('ProductHolder', 'default');
-		$holder->doPublish();
+        $holder = $this->objFromFixture('ProductHolder', 'default');
+        $holder->doPublish();
 
-		$product = $this->objFromFixture('ProductPage', 'product1');
-		$product->Title = "Test with trailing space ";
-		$product->doPublish();
+        $product = $this->objFromFixture('ProductPage', 'product1');
+        $product->Title = "Test with trailing space ";
+        $product->doPublish();
 
-		$this->assertTrue($product->Title == 'Test with trailing space');
+        $this->assertTrue($product->Title == 'Test with trailing space');
 
-	}
+    }
 
-	function testProductCategoryCreation(){
+    function testProductCategoryCreation(){
 
-		$this->logInWithPermission('Product_CANCRUD');
-		$category = $this->objFromFixture('ProductCategory', 'apparel');
-		$category->write();
-		$categoryID = $category->ID;
+        $this->logInWithPermission('Product_CANCRUD');
+        $category = $this->objFromFixture('ProductCategory', 'apparel');
+        $category->write();
+        $categoryID = $category->ID;
 
-		$productCategory = ProductCategory::get()->filter(array('Code'=>'APPAREL'))->first();
+        $productCategory = ProductCategory::get()->filter(array('Code'=>'APPAREL'))->first();
 
-		$this->assertTrue($categoryID == $productCategory->ID);
+        $this->assertTrue($categoryID == $productCategory->ID);
 
-	}
+    }
 
-	function testProductCategoryDeletion(){
+    function testProductCategoryDeletion(){
 
-		$this->logInWithPermission('Product_CANCRUD');
+        $this->logInWithPermission('Product_CANCRUD');
 
-		$category = $this->objFromFixture('ProductCategory', 'default');
-		$category->write();
+        $category = $this->objFromFixture('ProductCategory', 'default');
+        $category->write();
 
-		$this->assertFalse($category->canDelete());
+        $this->assertFalse($category->canDelete());
 
-		$category2 = $this->objFromFixture('ProductCategory', 'apparel');
-		$category2->write();
-		$category2ID = $category2->ID;
+        $category2 = $this->objFromFixture('ProductCategory', 'apparel');
+        $category2->write();
+        $category2ID = $category2->ID;
 
-		$this->assertTrue($category2->canDelete());
+        $this->assertTrue($category2->canDelete());
 
-		$this->logOut();
+        $this->logOut();
 
-		$this->logInWithPermission('ADMIN');
+        $this->logInWithPermission('ADMIN');
 
-		$this->assertFalse($category->canDelete());
-		$this->assertTrue($category2->canDelete());
+        $this->assertFalse($category->canDelete());
+        $this->assertTrue($category2->canDelete());
 
-		$this->logOut();
-		$this->logInWithPermission('Product_CANCRUD');
+        $this->logOut();
+        $this->logInWithPermission('Product_CANCRUD');
 
-		$category2->delete();
+        $category2->delete();
 
-		$this->assertFalse(in_array($category2ID,ProductCategory::get()->column('ID')));
+        $this->assertFalse(in_array($category2ID,ProductCategory::get()->column('ID')));
 
-	}
+    }
 
-	function testOptionGroupCreation(){
+    function testOptionGroupCreation(){
 
-		$this->logInWithPermission('Product_CANCRUD');
+        $this->logInWithPermission('Product_CANCRUD');
 
-		$group = $this->objFromFixture('OptionGroup', 'size');
-		$group->write();
+        $group = $this->objFromFixture('OptionGroup', 'size');
+        $group->write();
 
-		$this->assertNotNull(OptionGroup::get()->first());
+        $this->assertNotNull(OptionGroup::get()->first());
 
-	}
+    }
 
-	function testOptionGroupDeletion(){
+    function testOptionGroupDeletion(){
 
-		$this->logInWithPermission('ADMIN');
-		$group = $this->objFromFixture('OptionGroup', 'color');
-		$group->write();
-		$groupID = $group->ID;
+        $this->logInWithPermission('ADMIN');
+        $group = $this->objFromFixture('OptionGroup', 'color');
+        $group->write();
+        $groupID = $group->ID;
 
-		$this->assertTrue($group->canDelete());
+        $this->assertTrue($group->canDelete());
 
-		$this->logOut();
-		$this->logInWithPermission('Product_CANCRUD');
+        $this->logOut();
+        $this->logInWithPermission('Product_CANCRUD');
 
-		$this->assertTrue($group->canDelete());
-		$group->delete();
+        $this->assertTrue($group->canDelete());
+        $group->delete();
 
-		$this->assertFalse(in_array($groupID, OptionGroup::get()->column('ID')));
+        $this->assertFalse(in_array($groupID, OptionGroup::get()->column('ID')));
 
-	}
+    }
 
-	function testOptionItemCreation(){
+    function testOptionItemCreation(){
 
-		$this->logInWithPermission('Product_CANCRUD');
+        $this->logInWithPermission('Product_CANCRUD');
 
-		$optionGroup = OptionGroup::get()->filter(array('Title' => 'Sample-Group'))->first();
+        $optionGroup = OptionGroup::get()->filter(array('Title' => 'Sample-Group'))->first();
 
-		$option = $this->objFromFixture('OptionItem', 'large');
-		$option->ProductOptionGroupID = $optionGroup->ID;
-		$option->write();
+        $option = $this->objFromFixture('OptionItem', 'large');
+        $option->ProductOptionGroupID = $optionGroup->ID;
+        $option->write();
 
-		$optionID = $option->ID;
+        $optionID = $option->ID;
 
-		$optionItem = OptionItem::get()->filter(array('ProductOptionGroupID' => $optionGroup->ID))->first();
+        $optionItem = OptionItem::get()->filter(array('ProductOptionGroupID' => $optionGroup->ID))->first();
 
-		$this->assertEquals($optionID, $optionItem->ID);
+        $this->assertEquals($optionID, $optionItem->ID);
 
-	}
+    }
 
-	function testOptionItemDeletion(){
+    function testOptionItemDeletion(){
 
-		$this->logInWithPermission('ADMIN');
+        $this->logInWithPermission('ADMIN');
 
-		$optionGroup = $this->objFromFixture('OptionGroup', 'size');
-		$optionGroup->write();
+        $optionGroup = $this->objFromFixture('OptionGroup', 'size');
+        $optionGroup->write();
 
-		$option = $this->objFromFixture('OptionItem', 'small');
-		$option->write();
+        $option = $this->objFromFixture('OptionItem', 'small');
+        $option->write();
 
-		$optionID = $option->ID;
+        $optionID = $option->ID;
 
-		$this->assertTrue($option->canDelete());
+        $this->assertTrue($option->canDelete());
 
-		$this->logOut();
-		$this->logInWithPermission('Product_CANCRUD');
+        $this->logOut();
+        $this->logInWithPermission('Product_CANCRUD');
 
-		$this->assertTrue($option->canDelete());
-		$option->delete();
+        $this->assertTrue($option->canDelete());
+        $option->delete();
 
-		$this->assertFalse(in_array($optionID, OptionItem::get()->column('ID')));
+        $this->assertFalse(in_array($optionID, OptionItem::get()->column('ID')));
 
-	}
+    }
 
-	public function testProductDraftOptionDeletion(){
+    public function testProductDraftOptionDeletion(){
 
-		self::$use_draft_site = false;//make sure we can publish
+        self::$use_draft_site = false;//make sure we can publish
 
-		$this->logInWithPermission('ADMIN');
+        $this->logInWithPermission('ADMIN');
 
-		$holder = $this->objFromFixture('ProductHolder', 'default');//build holder page, ProductPage can't be on root level
-		$holder->doPublish();
+        $holder = $this->objFromFixture('ProductHolder', 'default');//build holder page, ProductPage can't be on root level
+        $holder->doPublish();
 
-		$product = $this->objFromFixture('ProductPage', 'product1');//build product page
-		$product->doPublish();
+        $product = $this->objFromFixture('ProductPage', 'product1');//build product page
+        $product->doPublish();
 
-		$productID = $product->ID;
+        $productID = $product->ID;
 
 
-		$optionGroup = $this->objFromFixture('OptionGroup', 'size');//build the group for the options
-		$optionGroup->write();
-		$option = $this->objFromFixture('OptionItem', 'small');//build first option
-		$option->write();
-		$option2 = $this->objFromFixture('OptionItem', 'large');//build second option
-		$option2->write();
+        $optionGroup = $this->objFromFixture('OptionGroup', 'size');//build the group for the options
+        $optionGroup->write();
+        $option = $this->objFromFixture('OptionItem', 'small');//build first option
+        $option->write();
+        $option2 = $this->objFromFixture('OptionItem', 'large');//build second option
+        $option2->write();
 
-		$this->assertTrue($product->isPublished());//check that product is published
+        $this->assertTrue($product->isPublished());//check that product is published
 
-		$product->deleteFromStage('Stage');//remove product from draft site
+        $product->deleteFromStage('Stage');//remove product from draft site
 
-		$this->assertTrue($product->isPublished());//check product is still published
+        $this->assertTrue($product->isPublished());//check product is still published
 
-		$testOption = $this->objFromFixture('OptionItem', 'large');
+        $testOption = $this->objFromFixture('OptionItem', 'large');
 
-		$this->assertThat($testOption->ID, $this->logicalNot($this->equalTo(0)));//make sure the first option still exists
+        $this->assertThat($testOption->ID, $this->logicalNot($this->equalTo(0)));//make sure the first option still exists
 
-		$product->doRestoreToStage();//restore page to draft site
-		$product->doUnpublish();//unpublish page
-		$product->deleteFromStage('Stage');//remove product from draft site
+        $product->doRestoreToStage();//restore page to draft site
+        $product->doUnpublish();//unpublish page
+        $product->deleteFromStage('Stage');//remove product from draft site
 
-		$checkDeleted = OptionItem::get()->filter(array('Title' => 'Large', 'ProductID' => $productID))->first();//query same option as above
+        $checkDeleted = OptionItem::get()->filter(array('Title' => 'Large', 'ProductID' => $productID))->first();//query same option as above
 
-		$this->assertEquals($checkDeleted->ID, 0);//check that the ID is 0 (empty object/non-existent)
-	}
+        $this->assertEquals($checkDeleted->ID, 0);//check that the ID is 0 (empty object/non-existent)
+    }
 }
\ No newline at end of file

Please login to merge, or discard this patch.

		@@ -2,30 +2,30 @@
		block discarded – undo
2	2
3	3	class StoreSettingsTest extends FS_Test{
4	4
5		- protected static $use_draft_site = true;
	5	+ protected static $use_draft_site = true;
6	6
7		- function setUp(){
8		- parent::setUp();
	7	+ function setUp(){
	8	+ parent::setUp();
9	9
10		- $siteConf = SiteConfig::current_site_config();
11		- $siteConf->StoreName = 'foxystripe';
	10	+ $siteConf = SiteConfig::current_site_config();
	11	+ $siteConf->StoreName = 'foxystripe';
12	12	$siteConf->requireDefaultRecords();
13		- $siteConf->write();
14		- }
	13	+ $siteConf->write();
	14	+ }
15	15
16		- function testStoreKey(){
17		- $pref = FoxyCart::getKeyPrefix();
18		- $siteConf = SiteConfig::current_site_config();
	16	+ function testStoreKey(){
	17	+ $pref = FoxyCart::getKeyPrefix();
	18	+ $siteConf = SiteConfig::current_site_config();
19	19
20		- $this->assertTrue(ctype_alnum($siteConf->StoreKey));
	20	+ $this->assertTrue(ctype_alnum($siteConf->StoreKey));
21	21	$this->assertEquals(strlen($siteConf->StoreKey), 60);
22	22	$this->assertEquals(substr($siteConf->StoreKey, 0, 6), $pref);
23		- }
	23	+ }
24	24
25		- function testStoreName(){
26		- $siteConf = SiteConfig::current_site_config();
	25	+ function testStoreName(){
	26	+ $siteConf = SiteConfig::current_site_config();
27	27
28	28	$this->assertEquals($siteConf->StoreName, 'foxystripe');
29		- }
	29	+ }
30	30
31	31	}

		@@ -2,242 +2,242 @@
		block discarded – undo
2	2
3	3	class ProductPageTest extends FS_Test{
4	4
5		- protected static $use_draft_site = true;
	5	+ protected static $use_draft_site = true;
6	6
7		- function setUp(){
8		- parent::setUp();
	7	+ function setUp(){
	8	+ parent::setUp();
9	9
10		- $groupForItem = OptionGroup::create();
11		- $groupForItem->Title = 'Sample-Group';
12		- $groupForItem->write();
	10	+ $groupForItem = OptionGroup::create();
	11	+ $groupForItem->Title = 'Sample-Group';
	12	+ $groupForItem->write();
13	13
14		- /*$productHolder = ProductHolder::create();
	14	+ /*$productHolder = ProductHolder::create();
15	15	$productHolder->Title = 'Product Holder';
16	16	$productHolder->write();*/
17		- }
	17	+ }
18	18
19		- function testProductCreation(){
	19	+ function testProductCreation(){
20	20
21		- $this->logInWithPermission('Product_CANCRUD');
22		- $default = $this->objFromFixture('ProductCategory', 'default');
23		- $holder = $this->objFromFixture('ProductHolder', 'default');
24		- $product1 = $this->objFromFixture('ProductPage', 'product1');
	21	+ $this->logInWithPermission('Product_CANCRUD');
	22	+ $default = $this->objFromFixture('ProductCategory', 'default');
	23	+ $holder = $this->objFromFixture('ProductHolder', 'default');
	24	+ $product1 = $this->objFromFixture('ProductPage', 'product1');
25	25
26		- $product1->doPublish();
27		- $this->assertTrue($product1->isPublished());
	26	+ $product1->doPublish();
	27	+ $this->assertTrue($product1->isPublished());
28	28
29		- }
	29	+ }
30	30
31		- function testProductDeletion(){
	31	+ function testProductDeletion(){
32	32
33		- $this->logInWithPermission('Product_CANCRUD');
34		- $holder = $this->objFromFixture('ProductHolder', 'default');
35		- $holder->doPublish();
36		- $product2 = $this->objFromFixture('ProductPage', 'product2');
37		- $productID = $product2->ID;
	33	+ $this->logInWithPermission('Product_CANCRUD');
	34	+ $holder = $this->objFromFixture('ProductHolder', 'default');
	35	+ $holder->doPublish();
	36	+ $product2 = $this->objFromFixture('ProductPage', 'product2');
	37	+ $productID = $product2->ID;
38	38
39		- $product2->doPublish();
40		- $this->assertTrue($product2->isPublished());
	39	+ $product2->doPublish();
	40	+ $this->assertTrue($product2->isPublished());
41	41
42		- $versions = DB::query('Select * FROM "ProductPage_versions" WHERE "RecordID" = '. $productID);
43		- $versionsPostPublish = array();
44		- foreach($versions as $versionRow) $versionsPostPublish[] = $versionRow;
	42	+ $versions = DB::query('Select * FROM "ProductPage_versions" WHERE "RecordID" = '. $productID);
	43	+ $versionsPostPublish = array();
	44	+ foreach($versions as $versionRow) $versionsPostPublish[] = $versionRow;
45	45
46		- $product2->delete();
47		- $this->assertTrue(!$product2->isPublished());
	46	+ $product2->delete();
	47	+ $this->assertTrue(!$product2->isPublished());
48	48
49		- $versions = DB::query('Select * FROM "ProductPage_versions" WHERE "RecordID" = '. $productID);
50		- $versionsPostDelete = array();
51		- foreach($versions as $versionRow) $versionsPostDelete[] = $versionRow;
	49	+ $versions = DB::query('Select * FROM "ProductPage_versions" WHERE "RecordID" = '. $productID);
	50	+ $versionsPostDelete = array();
	51	+ foreach($versions as $versionRow) $versionsPostDelete[] = $versionRow;
52	52
53		- $this->assertTrue($versionsPostPublish == $versionsPostDelete);
	53	+ $this->assertTrue($versionsPostPublish == $versionsPostDelete);
54	54
55		- }
	55	+ }
56	56
57		- function testProductTitleLeadingWhiteSpace(){
	57	+ function testProductTitleLeadingWhiteSpace(){
58	58
59		- $this->logInWithPermission('ADMIN');
	59	+ $this->logInWithPermission('ADMIN');
60	60
61		- $holder = $this->objFromFixture('ProductHolder', 'default');
62		- $holder->doPublish();
	61	+ $holder = $this->objFromFixture('ProductHolder', 'default');
	62	+ $holder->doPublish();
63	63
64		- $product = $this->objFromFixture('ProductPage', 'product1');
65		- $product->Title = " Test with leading space";
66		- $product->doPublish();
	64	+ $product = $this->objFromFixture('ProductPage', 'product1');
	65	+ $product->Title = " Test with leading space";
	66	+ $product->doPublish();
67	67
68		- $this->assertTrue($product->Title == 'Test with leading space');
	68	+ $this->assertTrue($product->Title == 'Test with leading space');
69	69
70		- }
	70	+ }
71	71
72		- function testProductTitleTrailingWhiteSpace(){
	72	+ function testProductTitleTrailingWhiteSpace(){
73	73
74		- $this->logInWithPermission('ADMIN');
	74	+ $this->logInWithPermission('ADMIN');
75	75
76		- $holder = $this->objFromFixture('ProductHolder', 'default');
77		- $holder->doPublish();
	76	+ $holder = $this->objFromFixture('ProductHolder', 'default');
	77	+ $holder->doPublish();
78	78
79		- $product = $this->objFromFixture('ProductPage', 'product1');
80		- $product->Title = "Test with trailing space ";
81		- $product->doPublish();
	79	+ $product = $this->objFromFixture('ProductPage', 'product1');
	80	+ $product->Title = "Test with trailing space ";
	81	+ $product->doPublish();
82	82
83		- $this->assertTrue($product->Title == 'Test with trailing space');
	83	+ $this->assertTrue($product->Title == 'Test with trailing space');
84	84
85		- }
	85	+ }
86	86
87		- function testProductCategoryCreation(){
	87	+ function testProductCategoryCreation(){
88	88
89		- $this->logInWithPermission('Product_CANCRUD');
90		- $category = $this->objFromFixture('ProductCategory', 'apparel');
91		- $category->write();
92		- $categoryID = $category->ID;
	89	+ $this->logInWithPermission('Product_CANCRUD');
	90	+ $category = $this->objFromFixture('ProductCategory', 'apparel');
	91	+ $category->write();
	92	+ $categoryID = $category->ID;
93	93
94		- $productCategory = ProductCategory::get()->filter(array('Code'=>'APPAREL'))->first();
	94	+ $productCategory = ProductCategory::get()->filter(array('Code'=>'APPAREL'))->first();
95	95
96		- $this->assertTrue($categoryID == $productCategory->ID);
	96	+ $this->assertTrue($categoryID == $productCategory->ID);
97	97
98		- }
	98	+ }
99	99
100		- function testProductCategoryDeletion(){
	100	+ function testProductCategoryDeletion(){
101	101
102		- $this->logInWithPermission('Product_CANCRUD');
	102	+ $this->logInWithPermission('Product_CANCRUD');
103	103
104		- $category = $this->objFromFixture('ProductCategory', 'default');
105		- $category->write();
	104	+ $category = $this->objFromFixture('ProductCategory', 'default');
	105	+ $category->write();
106	106
107		- $this->assertFalse($category->canDelete());
	107	+ $this->assertFalse($category->canDelete());
108	108
109		- $category2 = $this->objFromFixture('ProductCategory', 'apparel');
110		- $category2->write();
111		- $category2ID = $category2->ID;
	109	+ $category2 = $this->objFromFixture('ProductCategory', 'apparel');
	110	+ $category2->write();
	111	+ $category2ID = $category2->ID;
112	112
113		- $this->assertTrue($category2->canDelete());
	113	+ $this->assertTrue($category2->canDelete());
114	114
115		- $this->logOut();
	115	+ $this->logOut();
116	116
117		- $this->logInWithPermission('ADMIN');
	117	+ $this->logInWithPermission('ADMIN');
118	118
119		- $this->assertFalse($category->canDelete());
120		- $this->assertTrue($category2->canDelete());
	119	+ $this->assertFalse($category->canDelete());
	120	+ $this->assertTrue($category2->canDelete());
121	121
122		- $this->logOut();
123		- $this->logInWithPermission('Product_CANCRUD');
	122	+ $this->logOut();
	123	+ $this->logInWithPermission('Product_CANCRUD');
124	124
125		- $category2->delete();
	125	+ $category2->delete();
126	126
127		- $this->assertFalse(in_array($category2ID,ProductCategory::get()->column('ID')));
	127	+ $this->assertFalse(in_array($category2ID,ProductCategory::get()->column('ID')));
128	128
129		- }
	129	+ }
130	130
131		- function testOptionGroupCreation(){
	131	+ function testOptionGroupCreation(){
132	132
133		- $this->logInWithPermission('Product_CANCRUD');
	133	+ $this->logInWithPermission('Product_CANCRUD');
134	134
135		- $group = $this->objFromFixture('OptionGroup', 'size');
136		- $group->write();
	135	+ $group = $this->objFromFixture('OptionGroup', 'size');
	136	+ $group->write();
137	137
138		- $this->assertNotNull(OptionGroup::get()->first());
	138	+ $this->assertNotNull(OptionGroup::get()->first());
139	139
140		- }
	140	+ }
141	141
142		- function testOptionGroupDeletion(){
	142	+ function testOptionGroupDeletion(){
143	143
144		- $this->logInWithPermission('ADMIN');
145		- $group = $this->objFromFixture('OptionGroup', 'color');
146		- $group->write();
147		- $groupID = $group->ID;
	144	+ $this->logInWithPermission('ADMIN');
	145	+ $group = $this->objFromFixture('OptionGroup', 'color');
	146	+ $group->write();
	147	+ $groupID = $group->ID;
148	148
149		- $this->assertTrue($group->canDelete());
	149	+ $this->assertTrue($group->canDelete());
150	150
151		- $this->logOut();
152		- $this->logInWithPermission('Product_CANCRUD');
	151	+ $this->logOut();
	152	+ $this->logInWithPermission('Product_CANCRUD');
153	153
154		- $this->assertTrue($group->canDelete());
155		- $group->delete();
	154	+ $this->assertTrue($group->canDelete());
	155	+ $group->delete();
156	156
157		- $this->assertFalse(in_array($groupID, OptionGroup::get()->column('ID')));
	157	+ $this->assertFalse(in_array($groupID, OptionGroup::get()->column('ID')));
158	158
159		- }
	159	+ }
160	160
161		- function testOptionItemCreation(){
	161	+ function testOptionItemCreation(){
162	162
163		- $this->logInWithPermission('Product_CANCRUD');
	163	+ $this->logInWithPermission('Product_CANCRUD');
164	164
165		- $optionGroup = OptionGroup::get()->filter(array('Title' => 'Sample-Group'))->first();
	165	+ $optionGroup = OptionGroup::get()->filter(array('Title' => 'Sample-Group'))->first();
166	166
167		- $option = $this->objFromFixture('OptionItem', 'large');
168		- $option->ProductOptionGroupID = $optionGroup->ID;
169		- $option->write();
	167	+ $option = $this->objFromFixture('OptionItem', 'large');
	168	+ $option->ProductOptionGroupID = $optionGroup->ID;
	169	+ $option->write();
170	170
171		- $optionID = $option->ID;
	171	+ $optionID = $option->ID;
172	172
173		- $optionItem = OptionItem::get()->filter(array('ProductOptionGroupID' => $optionGroup->ID))->first();
	173	+ $optionItem = OptionItem::get()->filter(array('ProductOptionGroupID' => $optionGroup->ID))->first();
174	174
175		- $this->assertEquals($optionID, $optionItem->ID);
	175	+ $this->assertEquals($optionID, $optionItem->ID);
176	176
177		- }
	177	+ }
178	178
179		- function testOptionItemDeletion(){
	179	+ function testOptionItemDeletion(){
180	180
181		- $this->logInWithPermission('ADMIN');
	181	+ $this->logInWithPermission('ADMIN');
182	182
183		- $optionGroup = $this->objFromFixture('OptionGroup', 'size');
184		- $optionGroup->write();
	183	+ $optionGroup = $this->objFromFixture('OptionGroup', 'size');
	184	+ $optionGroup->write();
185	185
186		- $option = $this->objFromFixture('OptionItem', 'small');
187		- $option->write();
	186	+ $option = $this->objFromFixture('OptionItem', 'small');
	187	+ $option->write();
188	188
189		- $optionID = $option->ID;
	189	+ $optionID = $option->ID;
190	190
191		- $this->assertTrue($option->canDelete());
	191	+ $this->assertTrue($option->canDelete());
192	192
193		- $this->logOut();
194		- $this->logInWithPermission('Product_CANCRUD');
	193	+ $this->logOut();
	194	+ $this->logInWithPermission('Product_CANCRUD');
195	195
196		- $this->assertTrue($option->canDelete());
197		- $option->delete();
	196	+ $this->assertTrue($option->canDelete());
	197	+ $option->delete();
198	198
199		- $this->assertFalse(in_array($optionID, OptionItem::get()->column('ID')));
	199	+ $this->assertFalse(in_array($optionID, OptionItem::get()->column('ID')));
200	200
201		- }
	201	+ }
202	202
203		- public function testProductDraftOptionDeletion(){
	203	+ public function testProductDraftOptionDeletion(){
204	204
205		- self::$use_draft_site = false;//make sure we can publish
	205	+ self::$use_draft_site = false;//make sure we can publish
206	206
207		- $this->logInWithPermission('ADMIN');
	207	+ $this->logInWithPermission('ADMIN');
208	208
209		- $holder = $this->objFromFixture('ProductHolder', 'default');//build holder page, ProductPage can't be on root level
210		- $holder->doPublish();
	209	+ $holder = $this->objFromFixture('ProductHolder', 'default');//build holder page, ProductPage can't be on root level
	210	+ $holder->doPublish();
211	211
212		- $product = $this->objFromFixture('ProductPage', 'product1');//build product page
213		- $product->doPublish();
	212	+ $product = $this->objFromFixture('ProductPage', 'product1');//build product page
	213	+ $product->doPublish();
214	214
215		- $productID = $product->ID;
	215	+ $productID = $product->ID;
216	216
217	217
218		- $optionGroup = $this->objFromFixture('OptionGroup', 'size');//build the group for the options
219		- $optionGroup->write();
220		- $option = $this->objFromFixture('OptionItem', 'small');//build first option
221		- $option->write();
222		- $option2 = $this->objFromFixture('OptionItem', 'large');//build second option
223		- $option2->write();
	218	+ $optionGroup = $this->objFromFixture('OptionGroup', 'size');//build the group for the options
	219	+ $optionGroup->write();
	220	+ $option = $this->objFromFixture('OptionItem', 'small');//build first option
	221	+ $option->write();
	222	+ $option2 = $this->objFromFixture('OptionItem', 'large');//build second option
	223	+ $option2->write();
224	224
225		- $this->assertTrue($product->isPublished());//check that product is published
	225	+ $this->assertTrue($product->isPublished());//check that product is published
226	226
227		- $product->deleteFromStage('Stage');//remove product from draft site
	227	+ $product->deleteFromStage('Stage');//remove product from draft site
228	228
229		- $this->assertTrue($product->isPublished());//check product is still published
	229	+ $this->assertTrue($product->isPublished());//check product is still published
230	230
231		- $testOption = $this->objFromFixture('OptionItem', 'large');
	231	+ $testOption = $this->objFromFixture('OptionItem', 'large');
232	232
233		- $this->assertThat($testOption->ID, $this->logicalNot($this->equalTo(0)));//make sure the first option still exists
	233	+ $this->assertThat($testOption->ID, $this->logicalNot($this->equalTo(0)));//make sure the first option still exists
234	234
235		- $product->doRestoreToStage();//restore page to draft site
236		- $product->doUnpublish();//unpublish page
237		- $product->deleteFromStage('Stage');//remove product from draft site
	235	+ $product->doRestoreToStage();//restore page to draft site
	236	+ $product->doUnpublish();//unpublish page
	237	+ $product->deleteFromStage('Stage');//remove product from draft site
238	238
239		- $checkDeleted = OptionItem::get()->filter(array('Title' => 'Large', 'ProductID' => $productID))->first();//query same option as above
	239	+ $checkDeleted = OptionItem::get()->filter(array('Title' => 'Large', 'ProductID' => $productID))->first();//query same option as above
240	240
241		- $this->assertEquals($checkDeleted->ID, 0);//check that the ID is 0 (empty object/non-existent)
242		- }
	241	+ $this->assertEquals($checkDeleted->ID, 0);//check that the ID is 0 (empty object/non-existent)
	242	+ }
243	243	}
244	244	\ No newline at end of file

dynamic / foxystripe

Push — 2 ( 18ff94...35f095 )

Status

Category

Indentation +15 added lines, -15 removed lines patch added patch discarded remove patch

Indentation +145 added lines, -145 removed lines patch added patch discarded remove patch