DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 21:24:13 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

(develop): Fix failing Unit Tests (#6807)

Browse source 
* Reference correct class for Licence Model

* Make sure we activate users in test to send Welcome Notification
This commit is contained in:
Martin Meredith 2019-03-13 17:57:43 +00:00 committed by snipe
parent 400907cc40
commit a462e91983
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/Importer/UserImporter.php
View file

@ -19,6 +19,8 @@ use App\Notifications\WelcomeNotification;
class UserImporter extends ItemImporter class UserImporter extends ItemImporter
{ {
protected $users; protected $users;
protected $send_welcome = false;
public function __construct($filename) public function __construct($filename)
{ {
parent::__construct($filename); parent::__construct($filename);
@ -92,6 +94,7 @@ class UserImporter extends ItemImporter
'last_name' => $user->last_name, 'last_name' => $user->last_name,
'password' => $this->tempPassword, 'password' => $this->tempPassword,
]; ];
if ($this->send_welcome) { if ($this->send_welcome) {
$user->notify(new WelcomeNotification($data)); $user->notify(new WelcomeNotification($data));
} }
@ -131,4 +134,8 @@ class UserImporter extends ItemImporter
$this->logError($department, 'Company'); $this->logError($department, 'Company');
return null; return null;
} }
public function sendWelcome($send = true) {
$this->send_welcome = $send;
}
} }

2
tests/unit/DepreciationTest.php
View file

@ -39,7 +39,7 @@ class DepreciationTest extends BaseTest
{ {
$category = $this->createValidCategory('license-graphics-category'); $category = $this->createValidCategory('license-graphics-category');
$depreciation = $this->createValidDepreciation('computer', ['name' => 'New Depreciation']); $depreciation = $this->createValidDepreciation('computer', ['name' => 'New Depreciation']);
$licenses = factory(App\Models\LicenseModel::class, 5)->states('photoshop')->create([ $licenses = factory(App\Models\License::class, 5)->states('photoshop')->create([
'depreciation_id'=>$depreciation->id, 'depreciation_id'=>$depreciation->id,
'category_id' => $category->id 'category_id' => $category->id
]); ]);

10
tests/unit/ImporterTest.php
View file

@ -689,12 +689,14 @@ EOT;
Notification::fake(); Notification::fake();
$this->signIn(); $this->signIn();
$csv = <<<'EOT' $csv = <<<'EOT'
First Name,Last Name,email,Username,Location,Phone Number,Job Title,Employee Number,Company,Department First Name,Last Name,email,Username,Location,Phone Number,Job Title,Employee Number,Company,Department,activated
Blanche,O'Collopy,bocollopy0@livejournal.com,bocollopy0,Hinapalanan,63-(199)661-2186,Clinical Specialist,7080919053,Morar-Ward,Management Blanche,O'Collopy,bocollopy0@livejournal.com,bocollopy0,Hinapalanan,63-(199)661-2186,Clinical Specialist,7080919053,Morar-Ward,Management,1
Jessie,Primo,,jprimo1,Korenovsk,7-(885)578-0266,Paralegal,6284292031,Jast-Stiedemann Jessie,Primo,,jprimo1,Korenovsk,7-(885)578-0266,Paralegal,6284292031,Jast-Stiedemann,1
EOT; EOT;
$this->import(new UserImporter($csv)); $user_importer = new UserImporter($csv);
$user_importer->sendWelcome();
$this->import($user_importer);
$this->tester->seeRecord('users', [ $this->tester->seeRecord('users', [
'first_name' => 'Blanche', 'first_name' => 'Blanche',