Skip to content

Commit

Permalink
Merge branch '4.8' into 4.9
Browse files Browse the repository at this point in the history
  • Loading branch information
GuySartorelli committed May 26, 2022
2 parents 97ba7b0 + c88990d commit 570f42b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions tests/GraphQL/Legacy/AddElementToAreaMutationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

use DNADesign\Elemental\GraphQL\AddElementToAreaMutation;
use DNADesign\Elemental\Models\ElementalArea;
use DNADesign\Elemental\Tests\GraphQL\FakeResolveInfo;
use DNADesign\Elemental\Tests\Src\TestElement;
use SilverStripe\GraphQL\Tests\Fake\FakeResolveInfo;
use InvalidArgumentException;
use SilverStripe\Dev\SapphireTest;
use SilverStripe\GraphQL\Schema\Schema;
Expand Down Expand Up @@ -81,7 +81,7 @@ protected function runMutation($className, $elementalAreaID, $afterElementId = n
{
$mutation = new AddElementToAreaMutation();
$context = ['currentUser' => Security::getCurrentUser()];
$resolveInfo = new FakeResolveInfo();
$resolveInfo = new FakeResolveInfo([]);

$args = [
'className' => $className,
Expand Down
4 changes: 2 additions & 2 deletions tests/GraphQL/Legacy/SortBlockMutationCreatorTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
namespace DNADesign\Elemental\Tests\Legacy\GraphQL;

use DNADesign\Elemental\GraphQL\SortBlockMutationCreator;
use DNADesign\Elemental\Tests\GraphQL\FakeResolveInfo;
use DNADesign\Elemental\Tests\Src\TestElement;
use SilverStripe\GraphQL\Tests\Fake\FakeResolveInfo;
use SilverStripe\Dev\SapphireTest;
use SilverStripe\GraphQL\Schema\Schema;
use SilverStripe\Security\Security;
Expand Down Expand Up @@ -56,7 +56,7 @@ protected function runMutation($id, $afterBlockId)

$mutation = new SortBlockMutationCreator();
$context = ['currentUser' => $member];
$resolveInfo = new FakeResolveInfo();
$resolveInfo = new FakeResolveInfo([]);

$mutation->resolve(null, [
'id' => $id,
Expand Down

0 comments on commit 570f42b

Please sign in to comment.