mirror of
https://github.com/silverstripe/silverstripe-behat-extension
synced 2024-10-22 17:05:32 +02:00
Merge branch '5.3' into 5
This commit is contained in:
commit
0fe2d732ea
@ -379,7 +379,7 @@ class FixtureContext implements Context
|
||||
*/
|
||||
public function stepIAssignObjToObj($type, $value, $relationType, $relationId)
|
||||
{
|
||||
self::stepIAssignObjToObjInTheRelation($type, $value, $relationType, $relationId, null);
|
||||
FixtureContext::stepIAssignObjToObjInTheRelation($type, $value, $relationType, $relationId, null);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -51,7 +51,7 @@ class Extension implements ExtensionInterface
|
||||
*/
|
||||
public function getConfigKey()
|
||||
{
|
||||
return self::SILVERSTRIPE_ID;
|
||||
return Extension::SILVERSTRIPE_ID;
|
||||
}
|
||||
|
||||
public function initialize(ExtensionManager $extensionManager)
|
||||
|
@ -183,10 +183,10 @@ class RetryableCallHandler implements CallHandler
|
||||
return false;
|
||||
}
|
||||
$feature = $call->getFeature();
|
||||
if ($feature->hasTag(self::RETRY_TAG)) {
|
||||
if ($feature->hasTag(RetryableCallHandler::RETRY_TAG)) {
|
||||
return true;
|
||||
}
|
||||
$scenario = $this->getStepScenario($feature, $call->getStep());
|
||||
return $scenario && $scenario->hasTag(self::RETRY_TAG);
|
||||
return $scenario && $scenario->hasTag(RetryableCallHandler::RETRY_TAG);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user