Commit 79e1cb2a authored by Bojan Živanović's avatar Bojan Živanović
Browse files

Issue #2891985 by bojanz: Update for Commerce 2.0-RC1

parent b51649e0

composer.json

+2 −1
Changes for composer.json: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ 
    "homepage": "http://drupal.org/project/commerce_shipping",

    "license": "GPL-2.0+",

    "require": {

        "drupal/commerce": "2.x-dev"

        "drupal/commerce": "~2.0",

        "drupal/physical": "~1.0"

    },

    "minimum-stability": "dev"

}

tests/src/Functional/ShippingMethodTest.php→tests/src/FunctionalJavascript/ShippingMethodTest.php

+9 −5
Changes for tests/src/FunctionalJavascript/ShippingMethodTest.php: 9 added lines, 5 removed lines.
Original line number Diff line number Diff line 
<?php



namespace Drupal\Tests\commerce_shipping\Functional;

namespace Drupal\Tests\commerce_shipping\FunctionalJavascript;



use Drupal\commerce_shipping\Entity\ShippingMethod;

use Drupal\Tests\commerce\Functional\CommerceBrowserTestBase;

use Drupal\Tests\commerce\FunctionalJavascript\JavascriptTestTrait;



/**

 * Tests the shipping method UI.
@@ -12,6 +13,8 @@ use Drupal\Tests\commerce\Functional\CommerceBrowserTestBase; 
 */

class ShippingMethodTest extends CommerceBrowserTestBase {



  use JavascriptTestTrait;



  /**

   * {@inheritdoc}

   */
@@ -36,13 +39,14 @@ class ShippingMethodTest extends CommerceBrowserTestBase { 
    $this->getSession()->getPage()->clickLink('Add shipping method');

    $this->assertSession()->addressEquals('admin/commerce/config/shipping-methods/add');

    $this->assertSession()->fieldExists('name[0][value]');

    $this->getSession()->getPage()->fillField('plugin[0][plugin_select][target_plugin_id]', 'flat_rate');

    $this->getSession()->getPage()->fillField('plugin[0][target_plugin_id]', 'flat_rate');

    $this->waitForAjaxToFinish();



    $name = $this->randomMachineName(8);

    $edit = [

      'name[0][value]' => $name,

      'plugin[0][plugin_select][target_plugin_configuration][rate_label]' => 'Test label',

      'plugin[0][plugin_select][target_plugin_configuration][rate_amount][number]' => '10.00',

      'plugin[0][target_plugin_configuration][flat_rate][rate_label]' => 'Test label',

      'plugin[0][target_plugin_configuration][flat_rate][rate_amount][number]' => '10.00',

    ];



    $this->submitForm($edit, 'Save');
@@ -85,7 +89,7 @@ class ShippingMethodTest extends CommerceBrowserTestBase { 
    $new_shipping_method_name = $this->randomMachineName(8);

    $edit = [

      'name[0][value]' => $new_shipping_method_name,

      'plugin[0][plugin_select][target_plugin_configuration][rate_amount][number]' => '20.00',

      'plugin[0][target_plugin_configuration][flat_rate][rate_amount][number]' => '20.00',

    ];

    $this->submitForm($edit, 'Save');