mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-12-12 21:43:48 +08:00
ZIP Imports/Exports: Fixed some lint and test issues
Some checks failed
analyse-php / build (push) Waiting to run
lint-php / build (push) Waiting to run
test-migrations / build (8.1) (push) Waiting to run
test-migrations / build (8.2) (push) Waiting to run
test-migrations / build (8.3) (push) Waiting to run
test-php / build (8.1) (push) Waiting to run
test-php / build (8.2) (push) Waiting to run
test-php / build (8.3) (push) Waiting to run
lint-js / build (push) Has been cancelled
test-js / build (push) Has been cancelled
Some checks failed
analyse-php / build (push) Waiting to run
lint-php / build (push) Waiting to run
test-migrations / build (8.1) (push) Waiting to run
test-migrations / build (8.2) (push) Waiting to run
test-migrations / build (8.3) (push) Waiting to run
test-php / build (8.1) (push) Waiting to run
test-php / build (8.2) (push) Waiting to run
test-php / build (8.3) (push) Waiting to run
lint-js / build (push) Has been cancelled
test-js / build (push) Has been cancelled
- Updated test handling to create imports folder when required. - Updated some tests to delete created import zip files.
This commit is contained in:
parent
9ecc91929a
commit
95d62e7f57
|
@ -30,7 +30,7 @@ export {HeaderMobileToggle} from './header-mobile-toggle';
|
||||||
export {ImageManager} from './image-manager';
|
export {ImageManager} from './image-manager';
|
||||||
export {ImagePicker} from './image-picker';
|
export {ImagePicker} from './image-picker';
|
||||||
export {ListSortControl} from './list-sort-control';
|
export {ListSortControl} from './list-sort-control';
|
||||||
export {LoadingButton} from './loading-button';
|
export {LoadingButton} from './loading-button.ts';
|
||||||
export {MarkdownEditor} from './markdown-editor';
|
export {MarkdownEditor} from './markdown-editor';
|
||||||
export {NewUserPassword} from './new-user-password';
|
export {NewUserPassword} from './new-user-password';
|
||||||
export {Notification} from './notification';
|
export {Notification} from './notification';
|
||||||
|
|
|
@ -93,7 +93,6 @@ export class PageComments extends Component {
|
||||||
|
|
||||||
updateCount() {
|
updateCount() {
|
||||||
const count = this.getCommentCount();
|
const count = this.getCommentCount();
|
||||||
console.log('update count', count, this.container);
|
|
||||||
this.commentsTitle.textContent = window.$trans.choice(this.countText, count, {count});
|
this.commentsTitle.textContent = window.$trans.choice(this.countText, count, {count});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -168,6 +168,8 @@ class ZipImportTest extends TestCase
|
||||||
$resp->assertRedirect("/import/{$import->id}");
|
$resp->assertRedirect("/import/{$import->id}");
|
||||||
$this->assertFileExists(storage_path($import->path));
|
$this->assertFileExists(storage_path($import->path));
|
||||||
$this->assertActivityExists(ActivityType::IMPORT_CREATE);
|
$this->assertActivityExists(ActivityType::IMPORT_CREATE);
|
||||||
|
|
||||||
|
ZipTestHelper::deleteZipForImport($import);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function test_import_show_page()
|
public function test_import_show_page()
|
||||||
|
@ -325,6 +327,8 @@ class ZipImportTest extends TestCase
|
||||||
$resp = $this->followRedirects($resp);
|
$resp = $this->followRedirects($resp);
|
||||||
$resp->assertSeeText('The name field is required.');
|
$resp->assertSeeText('The name field is required.');
|
||||||
$resp->assertSeeText('The id must be an integer.');
|
$resp->assertSeeText('The id must be an integer.');
|
||||||
|
|
||||||
|
ZipTestHelper::deleteZipForImport($import);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function test_run_checks_permissions_on_import()
|
public function test_run_checks_permissions_on_import()
|
||||||
|
@ -340,6 +344,8 @@ class ZipImportTest extends TestCase
|
||||||
|
|
||||||
$resp = $this->followRedirects($resp);
|
$resp = $this->followRedirects($resp);
|
||||||
$resp->assertSeeText('You are lacking the required permissions to create books.');
|
$resp->assertSeeText('You are lacking the required permissions to create books.');
|
||||||
|
|
||||||
|
ZipTestHelper::deleteZipForImport($import);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function test_run_requires_parent_for_chapter_and_page_imports()
|
public function test_run_requires_parent_for_chapter_and_page_imports()
|
||||||
|
@ -379,6 +385,8 @@ class ZipImportTest extends TestCase
|
||||||
|
|
||||||
$resp = $this->followRedirects($resp);
|
$resp = $this->followRedirects($resp);
|
||||||
$resp->assertSee('Parent book required for chapter import.');
|
$resp->assertSee('Parent book required for chapter import.');
|
||||||
|
|
||||||
|
ZipTestHelper::deleteZipForImport($import);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function runImportFromFile(UploadedFile $file): TestResponse
|
protected function runImportFromFile(UploadedFile $file): TestResponse
|
||||||
|
|
|
@ -20,7 +20,14 @@ class ZipTestHelper
|
||||||
|
|
||||||
$import = Import::factory()->create($importData);
|
$import = Import::factory()->create($importData);
|
||||||
$zip = static::zipUploadFromData($zipData, $files);
|
$zip = static::zipUploadFromData($zipData, $files);
|
||||||
rename($zip->getRealPath(), storage_path($import->path));
|
$targetPath = storage_path($import->path);
|
||||||
|
$targetDir = dirname($targetPath);
|
||||||
|
|
||||||
|
if (!file_exists($targetDir)) {
|
||||||
|
mkdir($targetDir);
|
||||||
|
}
|
||||||
|
|
||||||
|
rename($zip->getRealPath(), $targetPath);
|
||||||
|
|
||||||
return $import;
|
return $import;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user