Updated tests to include receipt datetime submission

This commit is contained in:
Finn 2017-08-14 11:55:52 +01:00
parent 85c80980c3
commit f9703b6561
2 changed files with 85 additions and 48 deletions

View file

@ -29,13 +29,13 @@ print "test 1 - Create customer user account (Rufus)\n";
my $emailRufus = 'rufus@shinra.energy'; my $emailRufus = 'rufus@shinra.energy';
my $passwordRufus = 'MakoGold'; my $passwordRufus = 'MakoGold';
my $testJson = { my $testJson = {
'usertype' => 'customer', 'usertype' => 'customer',
'token' => shift(@account_tokens), 'token' => shift(@account_tokens),
'full_name' => 'RufusShinra', 'full_name' => 'RufusShinra',
'display_name' => 'RufusShinra', 'display_name' => 'RufusShinra',
'email' => $emailRufus, 'email' => $emailRufus,
'postcode' => 'RG26 5NU', 'postcode' => 'RG26 5NU',
'password' => $passwordRufus, 'password' => $passwordRufus,
'year_of_birth' => 2006 'year_of_birth' => 2006
}; };
$t->post_ok('/api/register' => json => $testJson) $t->post_ok('/api/register' => json => $testJson)
@ -47,17 +47,17 @@ print "test 2 - Create organisation user account (Choco Billy)\n";
my $emailBilly = 'choco.billy@chocofarm.org'; my $emailBilly = 'choco.billy@chocofarm.org';
my $passwordBilly = 'Choco'; my $passwordBilly = 'Choco';
$testJson = { $testJson = {
'usertype' => 'organisation', 'usertype' => 'organisation',
'token' => shift(@account_tokens), 'token' => shift(@account_tokens),
'name' => 'ChocoBillysGreens', 'name' => 'ChocoBillysGreens',
'email' => $emailBilly, 'email' => $emailBilly,
'postcode' => 'LA1 1HT', 'postcode' => 'LA1 1HT',
'password' => $passwordBilly, 'password' => $passwordBilly,
'street_name' => 'Market St', 'street_name' => 'Market St',
'town' => 'Lancaster', 'town' => 'Lancaster',
}; };
$t->post_ok('/api/register' => json => $testJson) $t->post_ok('/api/register' => json => $testJson)
->status_is(200) ->status_is(200)
->json_is('/success', Mojo::JSON->true); ->json_is('/success', Mojo::JSON->true);
my $session_key; my $session_key;
@ -106,6 +106,7 @@ my $json = {
street_name => "2 James St", street_name => "2 James St",
town => "Lancaster", town => "Lancaster",
postcode => "LA1 1UP", postcode => "LA1 1UP",
purchase_time => "2017-08-14T11:29:07.965+01:00",
session_key => $session_key, session_key => $session_key,
}; };
my $upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jpg'}}; my $upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jpg'}};
@ -133,6 +134,7 @@ $json = {
street_name => "The Crescent", street_name => "The Crescent",
town => "Morecambe", town => "Morecambe",
postcode => "LA4 5BZ", postcode => "LA4 5BZ",
purchase_time => "2017-08-14T11:29:07.965+01:00",
session_key => $session_key, session_key => $session_key,
}; };
$upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jpg'}}; $upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jpg'}};
@ -148,6 +150,7 @@ $json = {
street_name => "63-65 Church Street", street_name => "63-65 Church Street",
town => "Lancaster", town => "Lancaster",
postcode => "LA1 1ET", postcode => "LA1 1ET",
purchase_time => "2017-08-14T11:29:07.965+01:00",
session_key => $session_key, session_key => $session_key,
}; };
$upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jpg'}}; $upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jpg'}};
@ -180,7 +183,7 @@ sub check_vars{
->json_has("validated"); ->json_has("validated");
my $sessionJsonTest = $t->tx->res->json; my $sessionJsonTest = $t->tx->res->json;
my $validated = $sessionJsonTest->{validated}; my $validated = $sessionJsonTest->{validated};
my $unvalidated = $sessionJsonTest->{unvalidated}; my $unvalidated = $sessionJsonTest->{unvalidated};
my $validSize = scalar @$validated; my $validSize = scalar @$validated;
@ -188,7 +191,7 @@ sub check_vars{
is $validSize,$numValidated,"validated returned - " . $searchTerm; is $validSize,$numValidated,"validated returned - " . $searchTerm;
is $unvalidSize,$numUnvalidated,"unvalidated returned - " . $searchTerm; is $unvalidSize,$numUnvalidated,"unvalidated returned - " . $searchTerm;
}; };
print "test 11 - search blank\n"; print "test 11 - search blank\n";

View file

@ -16,6 +16,9 @@ $schema->resultset('AccountToken')->populate([
map { [ $_ ] } @account_tokens, map { [ $_ ] } @account_tokens,
]); ]);
#Add a test purchase_time to use for receipt uploading.
my $test_purchase_time = "2017-08-14T11:29:07.965+01:00";
#Add one company that we've apparently authenticated but does not have an account. #Add one company that we've apparently authenticated but does not have an account.
my $org_id_shinra = 1; my $org_id_shinra = 1;
@ -36,13 +39,13 @@ print "test 1 - Create customer user account (Rufus)\n";
my $emailRufus = 'rufus@shinra.energy'; my $emailRufus = 'rufus@shinra.energy';
my $passwordRufus = 'MakoGold'; my $passwordRufus = 'MakoGold';
my $testJson = { my $testJson = {
'usertype' => 'customer', 'usertype' => 'customer',
'token' => shift(@account_tokens), 'token' => shift(@account_tokens),
'full_name' => 'RufusShinra', 'full_name' => 'RufusShinra',
'display_name' => 'RufusShinra', 'display_name' => 'RufusShinra',
'email' => $emailRufus, 'email' => $emailRufus,
'postcode' => 'GU10 5SA', 'postcode' => 'GU10 5SA',
'password' => $passwordRufus, 'password' => $passwordRufus,
'year_of_birth' => 2006 'year_of_birth' => 2006
}; };
$t->post_ok('/api/register' => json => $testJson) $t->post_ok('/api/register' => json => $testJson)
@ -53,13 +56,13 @@ print "test 2 - Create customer user account (Hojo)\n";
my $emailHojo = 'hojo@shinra.energy'; my $emailHojo = 'hojo@shinra.energy';
my $passwordHojo = 'Mako'; my $passwordHojo = 'Mako';
$testJson = { $testJson = {
'usertype' => 'customer', 'usertype' => 'customer',
'token' => shift(@account_tokens), 'token' => shift(@account_tokens),
'display_name' => 'ProfessorHojo', 'display_name' => 'ProfessorHojo',
'full_name' => 'ProfessorHojo', 'full_name' => 'ProfessorHojo',
'email' => $emailHojo, 'email' => $emailHojo,
'postcode' => 'DE15 9LT', 'postcode' => 'DE15 9LT',
'password' => $passwordHojo, 'password' => $passwordHojo,
'year_of_birth' => 2006 'year_of_birth' => 2006
}; };
$t->post_ok('/api/register' => json => $testJson) $t->post_ok('/api/register' => json => $testJson)
@ -70,17 +73,17 @@ print "test 3 - Create organisation user account (Choco Billy)\n";
my $emailBilly = 'choco.billy@chocofarm.org'; my $emailBilly = 'choco.billy@chocofarm.org';
my $passwordBilly = 'Choco'; my $passwordBilly = 'Choco';
$testJson = { $testJson = {
'usertype' => 'organisation', 'usertype' => 'organisation',
'token' => shift(@account_tokens), 'token' => shift(@account_tokens),
'name' => 'ChocoBillysGreens', 'name' => 'ChocoBillysGreens',
'email' => $emailBilly, 'email' => $emailBilly,
'postcode' => 'SO50 7NJ', 'postcode' => 'SO50 7NJ',
'password' => $passwordBilly, 'password' => $passwordBilly,
'street_name' => 'Chocobo Farm, Eastern Continent', 'street_name' => 'Chocobo Farm, Eastern Continent',
'town' => 'Gaia', 'town' => 'Gaia',
}; };
$t->post_ok('/api/register' => json => $testJson) $t->post_ok('/api/register' => json => $testJson)
->status_is(200) ->status_is(200)
->json_is('/success', Mojo::JSON->true) ->json_is('/success', Mojo::JSON->true)
->json_like('/message', qr/Registered Successfully/); ->json_like('/message', qr/Registered Successfully/);
@ -110,6 +113,7 @@ $t->post_ok('/api/upload' => form => $upload )
print "test 6 - transaction_value missing\n"; print "test 6 - transaction_value missing\n";
my $json = { my $json = {
transaction_type => 1, transaction_type => 1,
purchase_time => $test_purchase_time,
organisation_id => $org_id_shinra, organisation_id => $org_id_shinra,
session_key => $session_key, session_key => $session_key,
}; };
@ -123,6 +127,7 @@ print "test 7 - transaction_value non-numbers\n";
$json = { $json = {
transaction_value => 'Abc', transaction_value => 'Abc',
transaction_type => 1, transaction_type => 1,
purchase_time => $test_purchase_time,
organisation_id => $org_id_shinra, organisation_id => $org_id_shinra,
session_key => $session_key, session_key => $session_key,
}; };
@ -136,6 +141,7 @@ print "test 8 - transaction_value equal to zero\n";
$json = { $json = {
transaction_value => 0, transaction_value => 0,
transaction_type => 1, transaction_type => 1,
purchase_time => $test_purchase_time,
organisation_id => $org_id_shinra, organisation_id => $org_id_shinra,
session_key => $session_key, session_key => $session_key,
}; };
@ -149,6 +155,7 @@ print "test 9 - transaction_value less than zero\n";
$json = { $json = {
transaction_value => -1, transaction_value => -1,
transaction_type => 1, transaction_type => 1,
purchase_time => $test_purchase_time,
organisation_id => $org_id_shinra, organisation_id => $org_id_shinra,
session_key => $session_key, session_key => $session_key,
}; };
@ -161,6 +168,7 @@ $t->post_ok('/api/upload' => form => $upload )
print "test 10 - transaction_type missing\n"; print "test 10 - transaction_type missing\n";
$json = { $json = {
transaction_value => 10, transaction_value => 10,
purchase_time => $test_purchase_time,
session_key => $session_key, session_key => $session_key,
}; };
$upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jpg'}}; $upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jpg'}};
@ -173,6 +181,7 @@ print "test 11 - transaction_type invalid.\n";
$json = { $json = {
transaction_value => 10, transaction_value => 10,
transaction_type => 4, transaction_type => 4,
purchase_time => $test_purchase_time,
session_key => $session_key, session_key => $session_key,
# organisation_id => $org_id_shinra # organisation_id => $org_id_shinra
}; };
@ -186,6 +195,7 @@ print "test 12 - file not uploaded.\n";
$json = { $json = {
transaction_value => 10, transaction_value => 10,
transaction_type => 1, transaction_type => 1,
purchase_time => $test_purchase_time,
organisation_id => 1, organisation_id => 1,
session_key => $session_key, session_key => $session_key,
}; };
@ -199,6 +209,7 @@ print "test 13 - organisation_id missing (type 1: already validated)\n";
$json = { $json = {
transaction_value => 10, transaction_value => 10,
transaction_type => 1, transaction_type => 1,
purchase_time => $test_purchase_time,
session_key => $session_key, session_key => $session_key,
# organisation_id => $org_id_shinra # organisation_id => $org_id_shinra
}; };
@ -212,6 +223,7 @@ print "test 14 - organisation_id for non-existent id. (type 1: already validated
$json = { $json = {
transaction_value => 10, transaction_value => 10,
transaction_type => 1, transaction_type => 1,
purchase_time => $test_purchase_time,
organisation_id => ($org_id_shinra + 100), organisation_id => ($org_id_shinra + 100),
session_key => $session_key, session_key => $session_key,
}; };
@ -226,6 +238,7 @@ is $schema->resultset('Transaction')->count, 0, "no transactions";
$json = { $json = {
transaction_value => 10, transaction_value => 10,
transaction_type => 1, transaction_type => 1,
purchase_time => $test_purchase_time,
organisation_id => $org_id_shinra, organisation_id => $org_id_shinra,
session_key => $session_key, session_key => $session_key,
}; };
@ -242,6 +255,7 @@ print "test 16 - organsation missing (type 3: new organisation)\n";
$json = { $json = {
transaction_value => 10, transaction_value => 10,
transaction_type => 3, transaction_type => 3,
purchase_time => $test_purchase_time,
street_name => "Slums, Sector 7", street_name => "Slums, Sector 7",
town => "Midgar", town => "Midgar",
postcode => "E1 0AA", postcode => "E1 0AA",
@ -260,6 +274,7 @@ is $schema->resultset('PendingTransaction')->count, 0, "No pending transactions"
$json = { $json = {
transaction_value => 10, transaction_value => 10,
transaction_type => 3, transaction_type => 3,
purchase_time => $test_purchase_time,
organisation_name => '7th Heaven', organisation_name => '7th Heaven',
street_name => "Slums, Sector 7", street_name => "Slums, Sector 7",
town => "Midgar", town => "Midgar",
@ -280,6 +295,7 @@ print "test 18 - organisation_id missing (type 2: existing organisation)\n";
$json = { $json = {
transaction_value => 10, transaction_value => 10,
transaction_type => 2, transaction_type => 2,
purchase_time => $test_purchase_time,
session_key => $session_key, session_key => $session_key,
}; };
$upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jpg'}}; $upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jpg'}};
@ -292,6 +308,7 @@ print "test 19 - organisation_id not a number (type 2: existing organisation)\n"
$json = { $json = {
transaction_value => 10, transaction_value => 10,
transaction_type => 2, transaction_type => 2,
purchase_time => $test_purchase_time,
organisation_id => "Abc", organisation_id => "Abc",
session_key => $session_key, session_key => $session_key,
}; };
@ -305,6 +322,7 @@ print "test 20 - id does not exist (type 2: existing organisation)\n";
$json = { $json = {
transaction_value => 10, transaction_value => 10,
transaction_type => 2, transaction_type => 2,
purchase_time => $test_purchase_time,
organisation_id => 1000, #Id that does not exist organisation_id => 1000, #Id that does not exist
session_key => $session_key, session_key => $session_key,
}; };
@ -314,7 +332,21 @@ $t->post_ok('/api/upload' => form => $upload )
->json_is('/success', Mojo::JSON->false) ->json_is('/success', Mojo::JSON->false)
->content_like(qr/organisation_id does not exist in the database/i); ->content_like(qr/organisation_id does not exist in the database/i);
print "test 21 - Logout Rufus (type 2: existing organisation)\n"; print "test 21 - purchase_time is missing\n";
is $schema->resultset('Transaction')->count, 0, "no transactions";
$json = {
transaction_value => 10,
transaction_type => 1,
organisation_id => $org_id_shinra,
session_key => $session_key,
};
$upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jpg'}};
$t->post_ok('/api/upload' => form => $upload )
->status_is(400)
->json_is('/success', Mojo::JSON->false)
->content_like(qr/purchase_time is missing/i);
print "test 22 - Logout Rufus (type 2: existing organisation)\n";
$t->post_ok('/api/logout', json => { session_key => $session_key } ) $t->post_ok('/api/logout', json => { session_key => $session_key } )
->status_is(200) ->status_is(200)
->json_is('/success', Mojo::JSON->true); ->json_is('/success', Mojo::JSON->true);
@ -325,7 +357,7 @@ $t->post_ok('/api/logout', json => { session_key => $session_key } )
#Login as Hojo (customer) #Login as Hojo (customer)
print "test 22 - Login Hojo (cookies, customer)\n"; print "test 23 - Login Hojo (cookies, customer)\n";
$testJson = { $testJson = {
'email' => $emailHojo, 'email' => $emailHojo,
'password' => $passwordHojo, 'password' => $passwordHojo,
@ -335,24 +367,25 @@ $t->post_ok('/api/login' => json => $testJson)
->json_is('/success', Mojo::JSON->true); ->json_is('/success', Mojo::JSON->true);
$session_key = $t->tx->res->json('/session_key'); $session_key = $t->tx->res->json('/session_key');
print "test 23 - add valid transaction but for with account (type 2: existing organisation)\n"; print "test 24 - add valid transaction but for with account (type 2: existing organisation)\n";
my $org_result = $schema->resultset('PendingOrganisation')->find({ name => '7th Heaven' }); my $org_result = $schema->resultset('PendingOrganisation')->find({ name => '7th Heaven' });
my $unvalidatedOrganisationId = $org_result->id; my $unvalidatedOrganisationId = $org_result->id;
is $schema->resultset('PendingTransaction')->count, 1, "1 pending transactions"; is $schema->resultset('PendingTransaction')->count, 1, "1 pending transactions";
$json = { $json = {
transaction_value => 10, transaction_value => 10,
transaction_type => 2, transaction_type => 2,
purchase_time => $test_purchase_time,
organisation_id => $unvalidatedOrganisationId, organisation_id => $unvalidatedOrganisationId,
session_key => $session_key, session_key => $session_key,
}; };
$upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jpg'}}; $upload = {json => Mojo::JSON::encode_json($json), file => {file => './t/test.jpg'}};
$t->post_ok('/api/upload' => form => $upload ) $t->post_ok('/api/upload' => form => $upload )
->status_is(400) ->status_is(400)
->json_is('/success', Mojo::JSON->false) ->json_is('/success', Mojo::JSON->false)
->content_like(qr/organisation_id does not exist in the database/i); ->content_like(qr/organisation_id does not exist in the database/i);
is $schema->resultset('PendingTransaction')->count, 1, "1 pending transactions"; is $schema->resultset('PendingTransaction')->count, 1, "1 pending transactions";
print "test 24 - Logout Hojo\n"; print "test 25 - Logout Hojo\n";
$t->post_ok('/api/logout', json => { session_key => $session_key } ) $t->post_ok('/api/logout', json => { session_key => $session_key } )
->status_is(200) ->status_is(200)
->json_is('/success', Mojo::JSON->true); ->json_is('/success', Mojo::JSON->true);
@ -363,7 +396,7 @@ $t->post_ok('/api/logout', json => { session_key => $session_key } )
#Login as Rufus (customer) #Login as Rufus (customer)
print "test 25 - Login Rufus (cookies, customer)\n"; print "test 26 - Login Rufus (cookies, customer)\n";
$testJson = { $testJson = {
'email' => $emailRufus, 'email' => $emailRufus,
'password' => $passwordRufus, 'password' => $passwordRufus,
@ -373,11 +406,12 @@ $t->post_ok('/api/login' => json => $testJson)
->json_is('/success', Mojo::JSON->true); ->json_is('/success', Mojo::JSON->true);
$session_key = $t->tx->res->json('/session_key'); $session_key = $t->tx->res->json('/session_key');
print "test 26 - add valid transaction (type 2: existing organisation)\n"; print "test 27 - add valid transaction (type 2: existing organisation)\n";
is $schema->resultset('PendingTransaction')->count, 1, "1 pending transactions"; is $schema->resultset('PendingTransaction')->count, 1, "1 pending transactions";
$json = { $json = {
transaction_value => 10, transaction_value => 10,
transaction_type => 2, transaction_type => 2,
purchase_time => $test_purchase_time,
organisation_id => $unvalidatedOrganisationId, organisation_id => $unvalidatedOrganisationId,
session_key => $session_key, session_key => $session_key,
}; };
@ -389,7 +423,7 @@ $t->post_ok('/api/upload' => form => $upload )
is $schema->resultset('PendingTransaction')->count, 2, "2 pending transactions"; is $schema->resultset('PendingTransaction')->count, 2, "2 pending transactions";
print "test 27 - Logout Rufus\n"; print "test 28 - Logout Rufus\n";
$t->post_ok('/api/logout' => json => { session_key => $session_key } ) $t->post_ok('/api/logout' => json => { session_key => $session_key } )
->status_is(200) ->status_is(200)
->json_is('/success', Mojo::JSON->true); ->json_is('/success', Mojo::JSON->true);
@ -400,7 +434,7 @@ $t->post_ok('/api/logout' => json => { session_key => $session_key } )
#Login as Choco Billy (organisation) #Login as Choco Billy (organisation)
print "test 28 - Login Choco Billy (cookies, organisation)\n"; print "test 29 - Login Choco Billy (cookies, organisation)\n";
$testJson = { $testJson = {
'email' => $emailBilly, 'email' => $emailBilly,
'password' => $passwordBilly, 'password' => $passwordBilly,
@ -410,11 +444,12 @@ $t->post_ok('/api/login' => json => $testJson)
->json_is('/success', Mojo::JSON->true); ->json_is('/success', Mojo::JSON->true);
$session_key = $t->tx->res->json('/session_key'); $session_key = $t->tx->res->json('/session_key');
print "test 29 - organisation buy from another organisation\n"; print "test 30 - organisation buy from another organisation\n";
is $schema->resultset('Transaction')->count, 1, "1 transaction"; is $schema->resultset('Transaction')->count, 1, "1 transaction";
$json = { $json = {
transaction_value => 100000, transaction_value => 100000,
transaction_type => 1, transaction_type => 1,
purchase_time => $test_purchase_time,
organisation_id => $org_id_shinra, organisation_id => $org_id_shinra,
session_key => $session_key, session_key => $session_key,
}; };
@ -426,4 +461,3 @@ $t->post_ok('/api/upload' => form => $upload )
is $schema->resultset('Transaction')->count, 2, "2 transaction"; is $schema->resultset('Transaction')->count, 2, "2 transaction";
done_testing(); done_testing();