projects
/
yaffs-website
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull merge.
[yaffs-website]
/
web
/
core
/
modules
/
file
/
tests
/
src
/
Functional
/
FileFieldTestBase.php
diff --git
a/web/core/modules/file/tests/src/Functional/FileFieldTestBase.php
b/web/core/modules/file/tests/src/Functional/FileFieldTestBase.php
index 16733144e31e792063bfa434ccf09770cc055e50..dc2e8becc139c126b2e5d4884b461d166cb792b4 100644
(file)
--- a/
web/core/modules/file/tests/src/Functional/FileFieldTestBase.php
+++ b/
web/core/modules/file/tests/src/Functional/FileFieldTestBase.php
@@
-7,6
+7,7
@@
use Drupal\field\Entity\FieldConfig;
use Drupal\file\FileInterface;
use Drupal\Tests\BrowserTestBase;
use Drupal\file\Entity\File;
use Drupal\file\FileInterface;
use Drupal\Tests\BrowserTestBase;
use Drupal\file\Entity\File;
+use Drupal\Tests\TestFileCreationTrait;
/**
* Provides methods specifically for testing File module's field handling.
/**
* Provides methods specifically for testing File module's field handling.
@@
-14,6
+15,9
@@
use Drupal\file\Entity\File;
abstract class FileFieldTestBase extends BrowserTestBase {
use FileFieldCreationTrait;
abstract class FileFieldTestBase extends BrowserTestBase {
use FileFieldCreationTrait;
+ use TestFileCreationTrait {
+ getTestFiles as drupalGetTestFiles;
+ }
/**
* Modules to enable.
/**
* Modules to enable.
@@
-156,7
+160,7
@@
abstract class FileFieldTestBase extends BrowserTestBase {
$edit[$name][] = $file_path;
}
}
$edit[$name][] = $file_path;
}
}
- $this->drupalPostForm("node/$nid/edit", $edit, t('Save
and keep published
'));
+ $this->drupalPostForm("node/$nid/edit", $edit, t('Save'));
return $nid;
}
return $nid;
}
@@
-172,7
+176,7
@@
abstract class FileFieldTestBase extends BrowserTestBase {
];
$this->drupalPostForm('node/' . $nid . '/edit', [], t('Remove'));
];
$this->drupalPostForm('node/' . $nid . '/edit', [], t('Remove'));
- $this->drupalPostForm(NULL, $edit, t('Save
and keep published
'));
+ $this->drupalPostForm(NULL, $edit, t('Save'));
}
/**
}
/**
@@
-180,12
+184,12
@@
abstract class FileFieldTestBase extends BrowserTestBase {
*/
public function replaceNodeFile($file, $field_name, $nid, $new_revision = TRUE) {
$edit = [
*/
public function replaceNodeFile($file, $field_name, $nid, $new_revision = TRUE) {
$edit = [
- 'files[' . $field_name . '_0]' =>
drupal_
realpath($file->getFileUri()),
+ 'files[' . $field_name . '_0]' =>
\Drupal::service('file_system')->
realpath($file->getFileUri()),
'revision' => (string) (int) $new_revision,
];
$this->drupalPostForm('node/' . $nid . '/edit', [], t('Remove'));
'revision' => (string) (int) $new_revision,
];
$this->drupalPostForm('node/' . $nid . '/edit', [], t('Remove'));
- $this->drupalPostForm(NULL, $edit, t('Save
and keep published
'));
+ $this->drupalPostForm(NULL, $edit, t('Save'));
}
/**
}
/**