@@ -15,115 +15,115 @@ |
||
| 15 | 15 | |
| 16 | 16 | class ImportTest extends TestCase |
| 17 | 17 | { |
| 18 | - use RefreshDatabase; |
|
| 18 | + use RefreshDatabase; |
|
| 19 | 19 | |
| 20 | - protected $import; |
|
| 20 | + protected $import; |
|
| 21 | 21 | |
| 22 | - protected function getPackageProviders($app) |
|
| 23 | - { |
|
| 24 | - return ['Ladybirdweb\ImportExport\ImportExportServiceProvider']; |
|
| 25 | - } |
|
| 22 | + protected function getPackageProviders($app) |
|
| 23 | + { |
|
| 24 | + return ['Ladybirdweb\ImportExport\ImportExportServiceProvider']; |
|
| 25 | + } |
|
| 26 | 26 | |
| 27 | 27 | protected function getEnvironmentSetUp($app) |
| 28 | 28 | { |
| 29 | 29 | $app['config']->set('database.default', 'testing'); |
| 30 | 30 | } |
| 31 | 31 | |
| 32 | - protected function setUp () |
|
| 33 | - { |
|
| 34 | - parent::setUp(); |
|
| 32 | + protected function setUp () |
|
| 33 | + { |
|
| 34 | + parent::setUp(); |
|
| 35 | 35 | |
| 36 | - $this->artisan('migrate', ['--database' => 'testing']); |
|
| 36 | + $this->artisan('migrate', ['--database' => 'testing']); |
|
| 37 | 37 | |
| 38 | - Route::middleware('web')->group(function() { |
|
| 38 | + Route::middleware('web')->group(function() { |
|
| 39 | 39 | |
| 40 | - Route::get( '/import/{id}/progress', [ 'as' => 'ladybirdweb.import.ajax.progress', 'uses' => 'Ladybirdweb\ImportExport\Import@returnImportProgress']); |
|
| 41 | - |
|
| 42 | - }); |
|
| 43 | - |
|
| 44 | - Storage::putFileAs('imports', new File( storage_path( 'test/test.csv' ) ), 'test.csv'); |
|
| 45 | - |
|
| 46 | - $this->import = ModelImport::create([ |
|
| 47 | - 'file' => 'imports/test.csv', |
|
| 48 | - 'file_rows' => 104, |
|
| 49 | - 'db_cols' => [ 'name', 'email', 'password'], |
|
| 50 | - 'model_map' => ['email', 'name', 'password'] |
|
| 51 | - ]); |
|
| 52 | - } |
|
| 53 | - |
|
| 54 | - /** |
|
| 55 | - * @test |
|
| 56 | - */ |
|
| 57 | - public function create_new_import_success() |
|
| 58 | - { |
|
| 59 | - $import = Import::createImport('imports/test.csv', [ 'name', 'email', 'password']); |
|
| 60 | - |
|
| 61 | - $this->assertInstanceOf(ModelImport::class, $import); |
|
| 62 | - } |
|
| 63 | - |
|
| 64 | - /** |
|
| 65 | - * @test |
|
| 66 | - */ |
|
| 67 | - public function fetch_import() |
|
| 68 | - { |
|
| 69 | - $import = Import::getImport($this->import->id); |
|
| 70 | - |
|
| 71 | - $this->assertInstanceOf(ModelImport::class, $import); |
|
| 72 | - } |
|
| 73 | - |
|
| 74 | - /** |
|
| 75 | - * @test |
|
| 76 | - */ |
|
| 77 | - public function get_few_rows_from_uploaded_file() |
|
| 78 | - { |
|
| 79 | - $csv_data = Import::getImportFileData($this->import->id); |
|
| 80 | - |
|
| 81 | - $this->assertInternalType( 'array', $csv_data ); |
|
| 82 | - } |
|
| 83 | - |
|
| 84 | - /** |
|
| 85 | - * @test |
|
| 86 | - */ |
|
| 87 | - public function store_data_map_with_csv_cols() |
|
| 88 | - { |
|
| 89 | - $import = Import::setDataMap(['email', 'name', 'password'], $this->import->id); |
|
| 90 | - |
|
| 91 | - $this->assertInstanceOf(ModelImport::class, $import); |
|
| 92 | - } |
|
| 93 | - |
|
| 94 | - /** |
|
| 95 | - * @test |
|
| 96 | - */ |
|
| 97 | - public function sucess_to_dispatch_given_job_class() |
|
| 98 | - { |
|
| 99 | - $import = $id = $this->import; |
|
| 100 | - |
|
| 101 | - Queue::fake(); |
|
| 102 | - |
|
| 103 | - Import::dispatchImportJob( FakeJob::class, $import ); |
|
| 104 | - |
|
| 105 | - Queue::assertPushedOn('importing', FakeJob::class); |
|
| 106 | - } |
|
| 107 | - |
|
| 108 | - /** |
|
| 109 | - * @test |
|
| 110 | - */ |
|
| 111 | - public function check_import_progress() |
|
| 112 | - { |
|
| 113 | - $response = $this->json( 'GET', '/import/1/progress' ); |
|
| 114 | - |
|
| 115 | - $response->assertStatus(200); |
|
| 116 | - |
|
| 117 | - $response->assertJsonFragment( ['status' => 200] ); |
|
| 118 | - |
|
| 119 | - $response->assertJsonFragment( ['progress'] ); |
|
| 120 | - } |
|
| 121 | - |
|
| 122 | - /** |
|
| 123 | - * @test |
|
| 124 | - */ |
|
| 125 | - public function remove_import() |
|
| 126 | - { |
|
| 127 | - $this->assertTrue(Import::removeImport($this->import->id)); |
|
| 128 | - } |
|
| 40 | + Route::get( '/import/{id}/progress', [ 'as' => 'ladybirdweb.import.ajax.progress', 'uses' => 'Ladybirdweb\ImportExport\Import@returnImportProgress']); |
|
| 41 | + |
|
| 42 | + }); |
|
| 43 | + |
|
| 44 | + Storage::putFileAs('imports', new File( storage_path( 'test/test.csv' ) ), 'test.csv'); |
|
| 45 | + |
|
| 46 | + $this->import = ModelImport::create([ |
|
| 47 | + 'file' => 'imports/test.csv', |
|
| 48 | + 'file_rows' => 104, |
|
| 49 | + 'db_cols' => [ 'name', 'email', 'password'], |
|
| 50 | + 'model_map' => ['email', 'name', 'password'] |
|
| 51 | + ]); |
|
| 52 | + } |
|
| 53 | + |
|
| 54 | + /** |
|
| 55 | + * @test |
|
| 56 | + */ |
|
| 57 | + public function create_new_import_success() |
|
| 58 | + { |
|
| 59 | + $import = Import::createImport('imports/test.csv', [ 'name', 'email', 'password']); |
|
| 60 | + |
|
| 61 | + $this->assertInstanceOf(ModelImport::class, $import); |
|
| 62 | + } |
|
| 63 | + |
|
| 64 | + /** |
|
| 65 | + * @test |
|
| 66 | + */ |
|
| 67 | + public function fetch_import() |
|
| 68 | + { |
|
| 69 | + $import = Import::getImport($this->import->id); |
|
| 70 | + |
|
| 71 | + $this->assertInstanceOf(ModelImport::class, $import); |
|
| 72 | + } |
|
| 73 | + |
|
| 74 | + /** |
|
| 75 | + * @test |
|
| 76 | + */ |
|
| 77 | + public function get_few_rows_from_uploaded_file() |
|
| 78 | + { |
|
| 79 | + $csv_data = Import::getImportFileData($this->import->id); |
|
| 80 | + |
|
| 81 | + $this->assertInternalType( 'array', $csv_data ); |
|
| 82 | + } |
|
| 83 | + |
|
| 84 | + /** |
|
| 85 | + * @test |
|
| 86 | + */ |
|
| 87 | + public function store_data_map_with_csv_cols() |
|
| 88 | + { |
|
| 89 | + $import = Import::setDataMap(['email', 'name', 'password'], $this->import->id); |
|
| 90 | + |
|
| 91 | + $this->assertInstanceOf(ModelImport::class, $import); |
|
| 92 | + } |
|
| 93 | + |
|
| 94 | + /** |
|
| 95 | + * @test |
|
| 96 | + */ |
|
| 97 | + public function sucess_to_dispatch_given_job_class() |
|
| 98 | + { |
|
| 99 | + $import = $id = $this->import; |
|
| 100 | + |
|
| 101 | + Queue::fake(); |
|
| 102 | + |
|
| 103 | + Import::dispatchImportJob( FakeJob::class, $import ); |
|
| 104 | + |
|
| 105 | + Queue::assertPushedOn('importing', FakeJob::class); |
|
| 106 | + } |
|
| 107 | + |
|
| 108 | + /** |
|
| 109 | + * @test |
|
| 110 | + */ |
|
| 111 | + public function check_import_progress() |
|
| 112 | + { |
|
| 113 | + $response = $this->json( 'GET', '/import/1/progress' ); |
|
| 114 | + |
|
| 115 | + $response->assertStatus(200); |
|
| 116 | + |
|
| 117 | + $response->assertJsonFragment( ['status' => 200] ); |
|
| 118 | + |
|
| 119 | + $response->assertJsonFragment( ['progress'] ); |
|
| 120 | + } |
|
| 121 | + |
|
| 122 | + /** |
|
| 123 | + * @test |
|
| 124 | + */ |
|
| 125 | + public function remove_import() |
|
| 126 | + { |
|
| 127 | + $this->assertTrue(Import::removeImport($this->import->id)); |
|
| 128 | + } |
|
| 129 | 129 | } |
@@ -16,102 +16,102 @@ |
||
| 16 | 16 | |
| 17 | 17 | class ExportTest extends TestCase |
| 18 | 18 | { |
| 19 | - use RefreshDatabase; |
|
| 19 | + use RefreshDatabase; |
|
| 20 | 20 | |
| 21 | - protected $export; |
|
| 21 | + protected $export; |
|
| 22 | 22 | |
| 23 | - protected function getPackageProviders($app) |
|
| 24 | - { |
|
| 25 | - return ['Ladybirdweb\ImportExport\ImportExportServiceProvider']; |
|
| 26 | - } |
|
| 23 | + protected function getPackageProviders($app) |
|
| 24 | + { |
|
| 25 | + return ['Ladybirdweb\ImportExport\ImportExportServiceProvider']; |
|
| 26 | + } |
|
| 27 | 27 | |
| 28 | 28 | protected function getEnvironmentSetUp($app) |
| 29 | 29 | { |
| 30 | 30 | $app['config']->set('database.default', 'testing'); |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | - protected function setUp () |
|
| 34 | - { |
|
| 35 | - parent::setUp(); |
|
| 33 | + protected function setUp () |
|
| 34 | + { |
|
| 35 | + parent::setUp(); |
|
| 36 | 36 | |
| 37 | - $this->artisan('migrate', ['--database' => 'testing']); |
|
| 37 | + $this->artisan('migrate', ['--database' => 'testing']); |
|
| 38 | 38 | |
| 39 | - Route::middleware('web')->group(function() { |
|
| 39 | + Route::middleware('web')->group(function() { |
|
| 40 | 40 | |
| 41 | - Route::get('/ticket/export/{id}', [ 'as' => 'ticket.export.progress', 'uses' => 'Ladybirdweb\ImportExport\Export@showExportStatus']); |
|
| 41 | + Route::get('/ticket/export/{id}', [ 'as' => 'ticket.export.progress', 'uses' => 'Ladybirdweb\ImportExport\Export@showExportStatus']); |
|
| 42 | 42 | |
| 43 | - Route::get( '/export/{id}/download', [ 'as' => 'ladybirdweb.export.download', 'uses' => 'Ladybirdweb\ImportExport\Export@downloadExportedFile']); |
|
| 43 | + Route::get( '/export/{id}/download', [ 'as' => 'ladybirdweb.export.download', 'uses' => 'Ladybirdweb\ImportExport\Export@downloadExportedFile']); |
|
| 44 | 44 | |
| 45 | - }); |
|
| 45 | + }); |
|
| 46 | 46 | |
| 47 | - Storage::putFileAs('exports', new File( storage_path( 'test/test.csv' ) ), 'test.xls'); |
|
| 47 | + Storage::putFileAs('exports', new File( storage_path( 'test/test.csv' ) ), 'test.xls'); |
|
| 48 | 48 | |
| 49 | - $this->export = ModelExport::create([ |
|
| 50 | - 'file' => 'test.xls', |
|
| 51 | - 'query' => \App\Models\User::select([ 'name', 'email', 'created_at' ])->getModel(), |
|
| 52 | - 'type' => 'xls' |
|
| 53 | - ]); |
|
| 54 | - } |
|
| 49 | + $this->export = ModelExport::create([ |
|
| 50 | + 'file' => 'test.xls', |
|
| 51 | + 'query' => \App\Models\User::select([ 'name', 'email', 'created_at' ])->getModel(), |
|
| 52 | + 'type' => 'xls' |
|
| 53 | + ]); |
|
| 54 | + } |
|
| 55 | 55 | |
| 56 | - /** |
|
| 57 | - * @test |
|
| 58 | - */ |
|
| 59 | - public function data_export_initiated_and_dispatched() |
|
| 60 | - { |
|
| 61 | - Queue::fake(); |
|
| 56 | + /** |
|
| 57 | + * @test |
|
| 58 | + */ |
|
| 59 | + public function data_export_initiated_and_dispatched() |
|
| 60 | + { |
|
| 61 | + Queue::fake(); |
|
| 62 | 62 | |
| 63 | - $export = Export::export( \App\Models\User::select([ 'name', 'email', 'created_at' ]), 'xls' ); |
|
| 63 | + $export = Export::export( \App\Models\User::select([ 'name', 'email', 'created_at' ]), 'xls' ); |
|
| 64 | 64 | |
| 65 | - $this->assertInstanceOf( ModelExport::class, $export ); |
|
| 65 | + $this->assertInstanceOf( ModelExport::class, $export ); |
|
| 66 | 66 | |
| 67 | - Queue::assertPushedOn('exporting', ExportJob::class); |
|
| 68 | - } |
|
| 67 | + Queue::assertPushedOn('exporting', ExportJob::class); |
|
| 68 | + } |
|
| 69 | 69 | |
| 70 | - /** |
|
| 71 | - * @test |
|
| 72 | - */ |
|
| 73 | - public function see_export_progress_page() |
|
| 74 | - { |
|
| 75 | - $response = $this->get('/ticket/export/' . $this->export->id); |
|
| 70 | + /** |
|
| 71 | + * @test |
|
| 72 | + */ |
|
| 73 | + public function see_export_progress_page() |
|
| 74 | + { |
|
| 75 | + $response = $this->get('/ticket/export/' . $this->export->id); |
|
| 76 | 76 | |
| 77 | - $response->assertStatus(200); |
|
| 77 | + $response->assertStatus(200); |
|
| 78 | 78 | |
| 79 | - $response->assertSee('Export'); |
|
| 80 | - } |
|
| 79 | + $response->assertSee('Export'); |
|
| 80 | + } |
|
| 81 | 81 | |
| 82 | - /** |
|
| 83 | - * @test |
|
| 84 | - */ |
|
| 85 | - public function check_export_progress_ajax() |
|
| 86 | - { |
|
| 87 | - $response = $this->json( 'GET', '/export/' . $this->export->id . '/progress'); |
|
| 82 | + /** |
|
| 83 | + * @test |
|
| 84 | + */ |
|
| 85 | + public function check_export_progress_ajax() |
|
| 86 | + { |
|
| 87 | + $response = $this->json( 'GET', '/export/' . $this->export->id . '/progress'); |
|
| 88 | 88 | |
| 89 | - $response->assertStatus(200); |
|
| 89 | + $response->assertStatus(200); |
|
| 90 | 90 | |
| 91 | - $response->assertJsonFragment( ['status' => 200] ); |
|
| 91 | + $response->assertJsonFragment( ['status' => 200] ); |
|
| 92 | 92 | |
| 93 | - $response->assertJsonFragment( ['progress'] ); |
|
| 94 | - } |
|
| 93 | + $response->assertJsonFragment( ['progress'] ); |
|
| 94 | + } |
|
| 95 | 95 | |
| 96 | - /** |
|
| 97 | - * @test |
|
| 98 | - */ |
|
| 99 | - public function try_download_exported_file() |
|
| 100 | - { |
|
| 101 | - $response = $this->get('/export/' . $this->export->id . '/download'); |
|
| 96 | + /** |
|
| 97 | + * @test |
|
| 98 | + */ |
|
| 99 | + public function try_download_exported_file() |
|
| 100 | + { |
|
| 101 | + $response = $this->get('/export/' . $this->export->id . '/download'); |
|
| 102 | 102 | |
| 103 | - $response->assertHeader( 'content-disposition', 'attachment; filename="test.xls"'); |
|
| 103 | + $response->assertHeader( 'content-disposition', 'attachment; filename="test.xls"'); |
|
| 104 | 104 | |
| 105 | - $response->assertStatus(200); |
|
| 106 | - } |
|
| 105 | + $response->assertStatus(200); |
|
| 106 | + } |
|
| 107 | 107 | |
| 108 | - /** |
|
| 109 | - * @test |
|
| 110 | - */ |
|
| 111 | - public function fail_download_exported_file() |
|
| 112 | - { |
|
| 113 | - $response = $this->get('/export/987654321/download'); |
|
| 108 | + /** |
|
| 109 | + * @test |
|
| 110 | + */ |
|
| 111 | + public function fail_download_exported_file() |
|
| 112 | + { |
|
| 113 | + $response = $this->get('/export/987654321/download'); |
|
| 114 | 114 | |
| 115 | - $response->assertStatus(404); |
|
| 116 | - } |
|
| 115 | + $response->assertStatus(404); |
|
| 116 | + } |
|
| 117 | 117 | } |
@@ -11,61 +11,61 @@ |
||
| 11 | 11 | |
| 12 | 12 | class ImportExportLogTest extends TestCase |
| 13 | 13 | { |
| 14 | - use RefreshDatabase; |
|
| 14 | + use RefreshDatabase; |
|
| 15 | 15 | |
| 16 | - protected $import; |
|
| 16 | + protected $import; |
|
| 17 | 17 | |
| 18 | - protected function getPackageProviders($app) |
|
| 19 | - { |
|
| 20 | - return ['Ladybirdweb\ImportExport\ImportExportServiceProvider']; |
|
| 21 | - } |
|
| 18 | + protected function getPackageProviders($app) |
|
| 19 | + { |
|
| 20 | + return ['Ladybirdweb\ImportExport\ImportExportServiceProvider']; |
|
| 21 | + } |
|
| 22 | 22 | |
| 23 | 23 | protected function getEnvironmentSetUp($app) |
| 24 | 24 | { |
| 25 | 25 | $app['config']->set('database.default', 'testing'); |
| 26 | 26 | } |
| 27 | 27 | |
| 28 | - protected function setUp () |
|
| 29 | - { |
|
| 30 | - parent::setUp(); |
|
| 28 | + protected function setUp () |
|
| 29 | + { |
|
| 30 | + parent::setUp(); |
|
| 31 | 31 | |
| 32 | - $this->artisan('migrate', ['--database' => 'testing']); |
|
| 32 | + $this->artisan('migrate', ['--database' => 'testing']); |
|
| 33 | 33 | |
| 34 | - $this->import = Import::create([ |
|
| 35 | - 'file' => 'imports/import-1530262997.csv', |
|
| 36 | - 'file_rows' => 104, |
|
| 37 | - 'db_cols' => [ 'name', 'email', 'password'], |
|
| 38 | - 'model_map' => ['email', 'name', 'password'] |
|
| 39 | - ]); |
|
| 40 | - } |
|
| 34 | + $this->import = Import::create([ |
|
| 35 | + 'file' => 'imports/import-1530262997.csv', |
|
| 36 | + 'file_rows' => 104, |
|
| 37 | + 'db_cols' => [ 'name', 'email', 'password'], |
|
| 38 | + 'model_map' => ['email', 'name', 'password'] |
|
| 39 | + ]); |
|
| 40 | + } |
|
| 41 | 41 | |
| 42 | - /** |
|
| 43 | - * @test |
|
| 44 | - */ |
|
| 45 | - public function save_new_log() |
|
| 46 | - { |
|
| 47 | - $import = $this->import; |
|
| 42 | + /** |
|
| 43 | + * @test |
|
| 44 | + */ |
|
| 45 | + public function save_new_log() |
|
| 46 | + { |
|
| 47 | + $import = $this->import; |
|
| 48 | 48 | |
| 49 | - $result = ImportExportLog::logImportError( $import, ['data' => 'this is test data'], 'This is not expected' ); |
|
| 49 | + $result = ImportExportLog::logImportError( $import, ['data' => 'this is test data'], 'This is not expected' ); |
|
| 50 | 50 | |
| 51 | - $this->assertInstanceOf( ModelImportExportLog::class, $result ); |
|
| 52 | - } |
|
| 51 | + $this->assertInstanceOf( ModelImportExportLog::class, $result ); |
|
| 52 | + } |
|
| 53 | 53 | |
| 54 | - /** |
|
| 55 | - * @test |
|
| 56 | - */ |
|
| 57 | - public function get_saved_logs() |
|
| 58 | - { |
|
| 59 | - $import = $this->import; |
|
| 54 | + /** |
|
| 55 | + * @test |
|
| 56 | + */ |
|
| 57 | + public function get_saved_logs() |
|
| 58 | + { |
|
| 59 | + $import = $this->import; |
|
| 60 | 60 | |
| 61 | - $log = ImportExportLog::logImportError( $import, ['data' => 'this is test data'], 'This is not expected' ); |
|
| 61 | + $log = ImportExportLog::logImportError( $import, ['data' => 'this is test data'], 'This is not expected' ); |
|
| 62 | 62 | |
| 63 | - $log_in_db = ImportExportLog::getLogs( $log->id ); |
|
| 63 | + $log_in_db = ImportExportLog::getLogs( $log->id ); |
|
| 64 | 64 | |
| 65 | - $this->assertInternalType( 'array', $log_in_db ); |
|
| 65 | + $this->assertInternalType( 'array', $log_in_db ); |
|
| 66 | 66 | |
| 67 | - $this->assertArrayHasKey( 'data', $log_in_db[0] ); |
|
| 67 | + $this->assertArrayHasKey( 'data', $log_in_db[0] ); |
|
| 68 | 68 | |
| 69 | - $this->assertArrayHasKey( 'message', $log_in_db[0] ); |
|
| 70 | - } |
|
| 69 | + $this->assertArrayHasKey( 'message', $log_in_db[0] ); |
|
| 70 | + } |
|
| 71 | 71 | } |