Skip to content

Commit

Permalink
upgraded to laravel 7 and added laravel ui package with npm install w…
Browse files Browse the repository at this point in the history 
…ith multiauth:install
  • Loading branch information
@sarthaksavvy
sarthaksavvy committed Mar 13, 2020
1 parent 35a10b6 commit ba19135
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .phpunit.result.cache
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
C:37:"PHPUnit\Runner\DefaultTestResultCache":7072:{a:2:{s:7:"defects";a:14:{s:96:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_only_see_master_and_role_drop_down";i:4;s:81:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_see_admin_home_page";i:4;s:90:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_non_super_admin_can_also_see_admin_home_page";i:4;s:85:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_see_admin_register_page";i:4;s:93:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_non_super_admin_can_not_see_admin_register_page";i:4;s:83:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_only_create_new_admin";i:4;s:86:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_non_super_admin_can_not_create_new_admin";i:4;s:82:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_see_all_other_admins";i:4;s:90:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_non_super_admin_can_not_see_all_other_admins";i:4;s:74:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_delete_admin";i:4;s:85:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_see_edit_page_for_admin";i:4;s:82:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_update_admin_details";i:4;s:91:"Bitfumes\Multiauth\Tests\Feature\AdminTest::on_registration_admin_get_an_confirmation_email";i:4;s:96:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_normal_admin_can_not_see_master_and_role_drop_down";i:4;}s:5:"times";a:57:{s:88:"Bitfumes\Multiauth\Tests\Feature\AdminActiveTest::non_active_admin_can_not_able_to_login";d:0.417;s:80:"Bitfumes\Multiauth\Tests\Feature\AdminActiveTest::active_admin_can_able_to_login";d:0.039;s:81:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_see_admin_home_page";d:0.083;s:90:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_non_super_admin_can_also_see_admin_home_page";d:0.065;s:85:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_see_admin_register_page";d:0.058;s:93:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_non_super_admin_can_not_see_admin_register_page";d:0.046;s:83:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_only_create_new_admin";d:0.188;s:86:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_non_super_admin_can_not_create_new_admin";d:0.052;s:82:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_see_all_other_admins";d:0.072;s:90:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_non_super_admin_can_not_see_all_other_admins";d:0.069;s:74:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_delete_admin";d:0.049;s:85:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_see_edit_page_for_admin";d:0.076;s:82:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_update_admin_details";d:0.118;s:91:"Bitfumes\Multiauth\Tests\Feature\AdminTest::on_registration_admin_get_an_confirmation_email";d:0.09;s:96:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_only_see_master_and_role_drop_down";d:0.106;s:96:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_normal_admin_can_not_see_master_and_role_drop_down";d:0.098;s:74:"Bitfumes\Multiauth\Tests\Feature\AdminValidationTest::admin_mode_need_name";d:0.082;s:75:"Bitfumes\Multiauth\Tests\Feature\AdminValidationTest::admin_mode_need_email";d:0.134;s:91:"Bitfumes\Multiauth\Tests\Feature\AdminValidationTest::admin_mode_need_password_confirmation";d:0.045;s:75:"Bitfumes\Multiauth\Tests\Feature\AdminValidationTest::admin_mode_need_rules";d:0.046;s:93:"Bitfumes\Multiauth\Tests\Feature\AdminValidationTest::while_update_admin_mode_need_validation";d:0.05;s:88:"Bitfumes\Multiauth\Tests\Feature\AttachRoleTest::a_super_admin_can_attach_roles_to_admin";d:0.053;s:97:"Bitfumes\Multiauth\Tests\Feature\AttachRoleTest::a_non_super_admin_can_not_attach__roles_to_admin";d:0.048;s:90:"Bitfumes\Multiauth\Tests\Feature\AttachRoleTest::a_super_user_can_detach_role_for_an_admin";d:0.049;s:89:"Bitfumes\Multiauth\Tests\Feature\CommandsTest::a_seed_command_can_publish_new_super_admin";d:0.099;s:75:"Bitfumes\Multiauth\Tests\Feature\LoginTest::a_user_can_see_admin_login_form";d:0.082;s:89:"Bitfumes\Multiauth\Tests\Feature\LoginTest::a_user_can_login_and_redirected_to_admin_home";d:0.136;s:88:"Bitfumes\Multiauth\Tests\Feature\LoginTest::logged_in_admin_can_not_see_admin_login_page";d:0.069;s:96:"Bitfumes\Multiauth\Tests\Feature\LoginTest::after_logout_admin_is_redirected_to_admin_login_page";d:0.041;s:76:"Bitfumes\Multiauth\Tests\Feature\PermissionTest::api_can_give_all_permission";d:0.051;s:79:"Bitfumes\Multiauth\Tests\Feature\PermissionTest::api_can_give_single_permission";d:0.045;s:77:"Bitfumes\Multiauth\Tests\Feature\PermissionTest::api_can_store_new_permission";d:0.045;s:74:"Bitfumes\Multiauth\Tests\Feature\PermissionTest::api_can_update_permission";d:0.049;s:74:"Bitfumes\Multiauth\Tests\Feature\PermissionTest::api_can_delete_permission";d:0.045;s:101:"Bitfumes\Multiauth\Tests\Feature\RedirectTest::it_will_redirect_after_login_to_route_define_in_config";d:0.052;s:88:"Bitfumes\Multiauth\Tests\Feature\ResetPasswordTest::a_admin_can_see_forgot_password_form";d:0.042;s:91:"Bitfumes\Multiauth\Tests\Feature\ResetPasswordTest::a_password_reset_link_email_can_be_sent";d:0.045;s:88:"Bitfumes\Multiauth\Tests\Feature\ResetPasswordTest::an_admin_can_see_reset_password_form";d:0.067;s:84:"Bitfumes\Multiauth\Tests\Feature\ResetPasswordTest::an_admin_can_change_its_password";d:0.049;s:88:"Bitfumes\Multiauth\Tests\Feature\ResetPasswordTest::admin_can_visit_change_password_page";d:0.075;s:89:"Bitfumes\Multiauth\Tests\Feature\ResetPasswordTest::admin_can_change_password_after_login";d:0.068;s:80:"Bitfumes\Multiauth\Tests\Feature\RoleTest::a_super_user_can_see_create_role_page";d:0.06;s:80:"Bitfumes\Multiauth\Tests\Feature\RoleTest::a_super_admin_can_only_store_new_role";d:0.051;s:83:"Bitfumes\Multiauth\Tests\Feature\RoleTest::normal_admin_can_not_only_store_new_role";d:0.057;s:88:"Bitfumes\Multiauth\Tests\Feature\RoleTest::a_super_admin_can_only_see_edit_page_for_role";d:0.053;s:79:"Bitfumes\Multiauth\Tests\Feature\RoleTest::a_super_admin_can_only_update_a_role";d:0.053;s:79:"Bitfumes\Multiauth\Tests\Feature\RoleTest::a_super_admin_can_only_delete_a_role";d:0.046;s:76:"Bitfumes\Multiauth\Tests\Feature\RouteTest::an_invalid_route_return_with_404";d:0.052;s:68:"Bitfumes\Multiauth\Tests\Unit\AdminTest::an_admin_can_have_many_role";d:0.034;s:67:"Bitfumes\Multiauth\Tests\Unit\AdminTest::it_can_bcrypt_the_password";d:0.038;s:80:"Bitfumes\Multiauth\Tests\Unit\AdminTest::it_can_send_password_reset_notification";d:0.04;s:69:"Bitfumes\Multiauth\Tests\Unit\PermissionTest::it_belongs_to_many_role";d:0.098;s:70:"Bitfumes\Multiauth\Tests\Unit\PermissionTest::it_belongs_many_to_admin";d:0.079;s:81:"Bitfumes\Multiauth\Tests\Unit\RegistrationTest::it_can_send_register_notification";d:0.048;s:73:"Bitfumes\Multiauth\Tests\Unit\RoleTest::it_has_admin_conected_to_any_role";d:0.047;s:79:"Bitfumes\Multiauth\Tests\Unit\RoleTest::a_role_can_not_be_deleted_if_has_admins";d:0.045;s:72:"Bitfumes\Multiauth\Tests\Unit\RoleTest::a_role_must_saved_in_lower_cased";d:0.059;}}}
C:37:"PHPUnit\Runner\DefaultTestResultCache":7070:{a:2:{s:7:"defects";a:14:{s:96:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_only_see_master_and_role_drop_down";i:4;s:81:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_see_admin_home_page";i:4;s:90:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_non_super_admin_can_also_see_admin_home_page";i:4;s:85:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_see_admin_register_page";i:4;s:93:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_non_super_admin_can_not_see_admin_register_page";i:4;s:83:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_only_create_new_admin";i:4;s:86:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_non_super_admin_can_not_create_new_admin";i:4;s:82:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_see_all_other_admins";i:4;s:90:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_non_super_admin_can_not_see_all_other_admins";i:4;s:74:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_delete_admin";i:4;s:85:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_see_edit_page_for_admin";i:4;s:82:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_update_admin_details";i:4;s:91:"Bitfumes\Multiauth\Tests\Feature\AdminTest::on_registration_admin_get_an_confirmation_email";i:3;s:96:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_normal_admin_can_not_see_master_and_role_drop_down";i:4;}s:5:"times";a:57:{s:88:"Bitfumes\Multiauth\Tests\Feature\AdminActiveTest::non_active_admin_can_not_able_to_login";d:0.226;s:80:"Bitfumes\Multiauth\Tests\Feature\AdminActiveTest::active_admin_can_able_to_login";d:0.036;s:81:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_see_admin_home_page";d:0.051;s:90:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_non_super_admin_can_also_see_admin_home_page";d:0.041;s:85:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_see_admin_register_page";d:0.044;s:93:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_non_super_admin_can_not_see_admin_register_page";d:0.041;s:83:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_only_create_new_admin";d:0.053;s:86:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_non_super_admin_can_not_create_new_admin";d:0.054;s:82:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_see_all_other_admins";d:0.053;s:90:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_non_super_admin_can_not_see_all_other_admins";d:0.043;s:74:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_delete_admin";d:0.044;s:85:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_see_edit_page_for_admin";d:0.046;s:82:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_update_admin_details";d:0.047;s:91:"Bitfumes\Multiauth\Tests\Feature\AdminTest::on_registration_admin_get_an_confirmation_email";d:0.05;s:96:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_super_admin_can_only_see_master_and_role_drop_down";d:0.044;s:96:"Bitfumes\Multiauth\Tests\Feature\AdminTest::a_normal_admin_can_not_see_master_and_role_drop_down";d:0.043;s:74:"Bitfumes\Multiauth\Tests\Feature\AdminValidationTest::admin_mode_need_name";d:0.041;s:75:"Bitfumes\Multiauth\Tests\Feature\AdminValidationTest::admin_mode_need_email";d:0.051;s:91:"Bitfumes\Multiauth\Tests\Feature\AdminValidationTest::admin_mode_need_password_confirmation";d:0.045;s:75:"Bitfumes\Multiauth\Tests\Feature\AdminValidationTest::admin_mode_need_rules";d:0.046;s:93:"Bitfumes\Multiauth\Tests\Feature\AdminValidationTest::while_update_admin_mode_need_validation";d:0.066;s:88:"Bitfumes\Multiauth\Tests\Feature\AttachRoleTest::a_super_admin_can_attach_roles_to_admin";d:0.072;s:97:"Bitfumes\Multiauth\Tests\Feature\AttachRoleTest::a_non_super_admin_can_not_attach__roles_to_admin";d:0.062;s:90:"Bitfumes\Multiauth\Tests\Feature\AttachRoleTest::a_super_user_can_detach_role_for_an_admin";d:0.065;s:89:"Bitfumes\Multiauth\Tests\Feature\CommandsTest::a_seed_command_can_publish_new_super_admin";d:0.058;s:75:"Bitfumes\Multiauth\Tests\Feature\LoginTest::a_user_can_see_admin_login_form";d:0.048;s:89:"Bitfumes\Multiauth\Tests\Feature\LoginTest::a_user_can_login_and_redirected_to_admin_home";d:0.062;s:88:"Bitfumes\Multiauth\Tests\Feature\LoginTest::logged_in_admin_can_not_see_admin_login_page";d:0.048;s:96:"Bitfumes\Multiauth\Tests\Feature\LoginTest::after_logout_admin_is_redirected_to_admin_login_page";d:0.047;s:76:"Bitfumes\Multiauth\Tests\Feature\PermissionTest::api_can_give_all_permission";d:0.061;s:79:"Bitfumes\Multiauth\Tests\Feature\PermissionTest::api_can_give_single_permission";d:0.06;s:77:"Bitfumes\Multiauth\Tests\Feature\PermissionTest::api_can_store_new_permission";d:0.053;s:74:"Bitfumes\Multiauth\Tests\Feature\PermissionTest::api_can_update_permission";d:0.057;s:74:"Bitfumes\Multiauth\Tests\Feature\PermissionTest::api_can_delete_permission";d:0.051;s:101:"Bitfumes\Multiauth\Tests\Feature\RedirectTest::it_will_redirect_after_login_to_route_define_in_config";d:0.069;s:88:"Bitfumes\Multiauth\Tests\Feature\ResetPasswordTest::a_admin_can_see_forgot_password_form";d:0.05;s:91:"Bitfumes\Multiauth\Tests\Feature\ResetPasswordTest::a_password_reset_link_email_can_be_sent";d:0.058;s:88:"Bitfumes\Multiauth\Tests\Feature\ResetPasswordTest::an_admin_can_see_reset_password_form";d:0.05;s:84:"Bitfumes\Multiauth\Tests\Feature\ResetPasswordTest::an_admin_can_change_its_password";d:0.048;s:88:"Bitfumes\Multiauth\Tests\Feature\ResetPasswordTest::admin_can_visit_change_password_page";d:0.04;s:89:"Bitfumes\Multiauth\Tests\Feature\ResetPasswordTest::admin_can_change_password_after_login";d:0.065;s:80:"Bitfumes\Multiauth\Tests\Feature\RoleTest::a_super_user_can_see_create_role_page";d:0.071;s:80:"Bitfumes\Multiauth\Tests\Feature\RoleTest::a_super_admin_can_only_store_new_role";d:0.06;s:83:"Bitfumes\Multiauth\Tests\Feature\RoleTest::normal_admin_can_not_only_store_new_role";d:0.071;s:88:"Bitfumes\Multiauth\Tests\Feature\RoleTest::a_super_admin_can_only_see_edit_page_for_role";d:0.081;s:79:"Bitfumes\Multiauth\Tests\Feature\RoleTest::a_super_admin_can_only_update_a_role";d:0.058;s:79:"Bitfumes\Multiauth\Tests\Feature\RoleTest::a_super_admin_can_only_delete_a_role";d:0.064;s:76:"Bitfumes\Multiauth\Tests\Feature\RouteTest::an_invalid_route_return_with_404";d:0.067;s:68:"Bitfumes\Multiauth\Tests\Unit\AdminTest::an_admin_can_have_many_role";d:0.041;s:67:"Bitfumes\Multiauth\Tests\Unit\AdminTest::it_can_bcrypt_the_password";d:0.039;s:80:"Bitfumes\Multiauth\Tests\Unit\AdminTest::it_can_send_password_reset_notification";d:0.034;s:69:"Bitfumes\Multiauth\Tests\Unit\PermissionTest::it_belongs_to_many_role";d:0.036;s:70:"Bitfumes\Multiauth\Tests\Unit\PermissionTest::it_belongs_many_to_admin";d:0.036;s:81:"Bitfumes\Multiauth\Tests\Unit\RegistrationTest::it_can_send_register_notification";d:0.032;s:73:"Bitfumes\Multiauth\Tests\Unit\RoleTest::it_has_admin_conected_to_any_role";d:0.028;s:79:"Bitfumes\Multiauth\Tests\Unit\RoleTest::a_role_can_not_be_deleted_if_has_admins";d:0.036;s:72:"Bitfumes\Multiauth\Tests\Unit\RoleTest::a_role_must_saved_in_lower_cased";d:0.033;}}}
16 changes: 9 additions & 7 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,16 @@
}
],
"minimum-stability": "dev",
"require": {},
"require": {
"laravel/ui": "^2.0"
},
"require-dev": {
"phpunit/phpunit": "^8.0",
"mockery/mockery": "^1.0@dev",
"orchestra/testbench": "^4.0",
"orchestra/database": "^4.0",
"illuminate/support": "^5.8|^6.0",
"fzaninotto/faker": "^1.9@dev"
"phpunit/phpunit": "^8.5",
"mockery/mockery": "^1.3.1",
"orchestra/testbench": "^5.0",
"orchestra/database": "^5.0",
"illuminate/support": "7.0",
"fzaninotto/faker": "^1.9"
},
"autoload": {
"psr-4": {
Expand Down
11 changes: 11 additions & 0 deletions src/Console/Commands/Install.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ public function handle()
$this->runMigration();

$this->seedSuperAdmin();

$this->publishAndCompileUI();
}

protected function publishAssets()
Expand All @@ -69,4 +71,13 @@ protected function seedSuperAdmin()
Artisan::call('multiauth:seed --role=super');
$this->info(Artisan::output());
}

protected function publishAndCompileUI()
{
$this->warn('5. Publishing UI bootstrap copmonent');
Artisan::call('ui bootstrap');
$this->info(Artisan::output());
$this->warn('Running npm, please wait...');
$this->info(shell_exec('npm install && npm run dev'));
}
}
2 changes: 1 addition & 1 deletion tests/Feature/AdminTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public function a_super_admin_can_update_admin_details()
/** @test */
public function on_registration_admin_get_an_confirmation_email()
{
// $app['config']->set('multiauth.registration_notification_email', true); set on base testcase
app()['config']->set('multiauth.registration_notification_email', true);
Notification::fake();
$this->createNewAdminWithRole();
$admin = Admin::find(2);
Expand Down
2 changes: 1 addition & 1 deletion tests/TestCase.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ protected function getEnvironmentSetUp($app)
{
$app['config']->set('app.key', 'AckfSECXIvnK5r28GVIWUAxmbBSjTsmF');
$app['config']->set('database.default', 'testing');
$app['config']->set('multiauth.registration_notification_email', true);
$app['config']->set('multiauth.registration_notification_email', false);
$app['config']->set('database.connections.testing', [
'driver' => 'sqlite',
'database' => ':memory:',
Expand Down

0 comments on commit ba19135

Please sign in to comment.