diff --git a/uc_product_kit/tests/uc_product_kit.test b/uc_product_kit/tests/uc_product_kit.test index 1c41617..93d132c 100644 --- a/uc_product_kit/tests/uc_product_kit.test +++ b/uc_product_kit/tests/uc_product_kit.test @@ -25,6 +25,9 @@ class UbercartProductKitTestCase extends UbercartTestHelper { public function testProductKitNodeForm() { $this->drupalLogin($this->adminUser); + // Allow the default quantity to be set. + variable_set('uc_product_add_to_cart_qty', TRUE); + // Create some test products. $products = array(); for ($i = 0; $i < 3; $i++) { @@ -47,6 +50,7 @@ class UbercartProductKitTestCase extends UbercartTestHelper { $products[1]->nid, $products[2]->nid, ), + 'default_qty' => mt_rand(2, 100), ); $this->drupalPost('node/add/product-kit', $edit, 'Save'); $this->assertText(t('Product kit @title has been created.', array('@title' => $edit['title']))); @@ -56,6 +60,7 @@ class UbercartProductKitTestCase extends UbercartTestHelper { $this->assertText('1 × ' . $products[2]->title, 'Product 3 title found.'); $total = $products[0]->sell_price + $products[1]->sell_price + $products[2]->sell_price; $this->assertText(uc_currency_format($total), 'Product kit total found.'); + $this->assertFieldByName('qty', $edit['default_qty']); } public function testProductKitDiscounts() { @@ -75,6 +80,7 @@ class UbercartProductKitTestCase extends UbercartTestHelper { $products[2]->nid, ), 'mutable' => UC_PRODUCT_KIT_UNMUTABLE_NO_LIST, + 'default_qty' => 1, 'ordering' => 0, )); @@ -143,6 +149,7 @@ class UbercartProductKitTestCase extends UbercartTestHelper { $products[1]->nid, $products[2]->nid, ), + 'default_qty' => 1, 'ordering' => 0, ); diff --git a/uc_product_kit/uc_product_kit.module b/uc_product_kit/uc_product_kit.module index 3a1d6cb..7ab112b 100644 --- a/uc_product_kit/uc_product_kit.module +++ b/uc_product_kit/uc_product_kit.module @@ -142,7 +142,7 @@ function uc_product_kit_insert(&$node) { $obj->sell_price = 0; $obj->weight = 0; $obj->weight_units = variable_get('uc_weight_unit', 'lb'); - $obj->default_qty = 0; + $obj->default_qty = $node->default_qty; $obj->ordering = $node->ordering; $obj->shippable = FALSE; diff --git a/uc_taxes/tests/uc_taxes.test b/uc_taxes/tests/uc_taxes.test index 509f2fb..687c7b9 100644 --- a/uc_taxes/tests/uc_taxes.test +++ b/uc_taxes/tests/uc_taxes.test @@ -84,6 +84,7 @@ class UbercartInclusiveTaxesTestCase extends UbercartTestHelper { 'products' => array($product->nid), 'ordering' => 0, 'mutable' => UC_PRODUCT_KIT_UNMUTABLE_WITH_LIST, + 'default_qty' => 1, )); // Set the kit total to $9 to automatically apply a discount.