diff --git a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php index 15e9e25..112f85f 100644 --- a/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php +++ b/core/tests/Drupal/Tests/Core/Config/Entity/ConfigEntityStorageTest.php @@ -253,7 +253,7 @@ public function testSaveInsert(EntityInterface $entity) { $this->configFactory->expects($this->exactly(1)) ->method('getEditable') - ->with('the_config_prefix.foo', FALSE) + ->with('the_config_prefix.foo') ->will($this->returnValue($config_object)); $this->moduleHandler->expects($this->at(0)) @@ -321,7 +321,7 @@ public function testSaveUpdate(EntityInterface $entity) { ->will($this->returnValue($config_object)); $this->configFactory->expects($this->exactly(1)) ->method('getEditable') - ->with('the_config_prefix.foo', FALSE) + ->with('the_config_prefix.foo') ->will($this->returnValue($config_object)); $this->moduleHandler->expects($this->at(0)) @@ -377,6 +377,10 @@ public function testSaveRename(ConfigEntityInterface $entity) { $this->configFactory->expects($this->once()) ->method('rename') + ->willReturn($this->configFactory); + $this->configFactory->expects($this->exactly(1)) + ->method('getEditable') + ->with('the_config_prefix.bar') ->will($this->returnValue($config_object)); $this->configFactory->expects($this->exactly(2)) ->method('loadMultiple') @@ -513,8 +517,11 @@ public function testSaveNoMismatch() { ->will($this->returnValue($config_object)); $this->configFactory->expects($this->once()) ->method('rename') + ->willReturn($this->configFactory); + $this->configFactory->expects($this->exactly(1)) + ->method('getEditable') + ->with('the_config_prefix.foo') ->will($this->returnValue($config_object)); - $this->entityQuery->expects($this->once()) ->method('condition') ->will($this->returnSelf()); @@ -731,7 +738,7 @@ public function testDelete() { $config_object->expects($this->once()) ->method('delete'); $configs[] = $config_object; - $config_map[] = array("the_config_prefix.$id", FALSE, $config_object); + $config_map[] = array("the_config_prefix.$id", $config_object); } $this->cacheTagsInvalidator->expects($this->once()) diff --git a/core/tests/Drupal/Tests/UnitTestCase.php b/core/tests/Drupal/Tests/UnitTestCase.php index 855f3f0..d6deb9e 100644 --- a/core/tests/Drupal/Tests/UnitTestCase.php +++ b/core/tests/Drupal/Tests/UnitTestCase.php @@ -126,7 +126,7 @@ public function getConfigFactoryStub(array $configs = array()) { $mutable_config_object->expects($this->any()) ->method('get') ->will($this->returnValueMap($map)); - $config_editable_map[] = array($config_name, TRUE, $mutable_config_object); + $config_editable_map[] = array($config_name, $mutable_config_object); } // Construct a config factory with the array of configuration object stubs // as its return map.