Skip to content

Commit

Permalink
fix compatibility with Mojolicious 6.22
Browse files Browse the repository at this point in the history 
prepare for release
  • Loading branch information
@jberger
jberger committed Sep 28, 2015
1 parent 72ecbc3 commit 651a833
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 30 deletions.
3 changes: 2 additions & 1 deletion Changes
View file
@@ -1,8 +1,9 @@
Revision history for Perl module Galileo

0.XXX
0.039 2015-09-28
- Simplify home path logic
- Remove ConsoleLogger again
- Fix compatibility with Mojolicious 6.22

0.0038 2015-01-25
- Fixed compatibility with recent Mojolicious
Expand Down
2 changes: 1 addition & 1 deletion lib/Galileo.pm
View file
@@ -1,7 +1,7 @@
package Galileo;
use Mojo::Base 'Mojolicious';

our $VERSION = '0.038';
our $VERSION = '0.039';
$VERSION = eval $VERSION;

use File::Basename 'dirname';
Expand Down
47 changes: 24 additions & 23 deletions t/basic.t
View file
Expand Up @@ -6,6 +6,7 @@ use Test::More;
use Test::Mojo;
use Mojo::JSON 'j';
use Mojo::DOM;
use Mojo::JSON qw/true false/;

my $t = Galileo::DB::Deploy->create_test_object({test => 1});
$t->ua->max_redirects(2);
Expand Down Expand Up @@ -88,7 +89,7 @@ subtest 'Edit Page' => sub {
$t->websocket_ok( '/store/page' )
->send_ok({ json => $data })
->message_ok
->json_message_is( { success => 1, message => 'Changes saved' } )
->json_message_is( { success => true, message => 'Changes saved' } )
->finish_ok;

# see that the changes are reflected
Expand All @@ -107,7 +108,7 @@ subtest 'Edit Page' => sub {
$t->websocket_ok( '/store/page' )
->send_ok({ json => $data_notitle })
->message_ok
->json_message_is( { success => 0, message => 'Not saved! A title is required!' } )
->json_message_is( { success => false, message => 'Not saved! A title is required!' } )
->finish_ok;

};
Expand All @@ -131,7 +132,7 @@ subtest 'New Page' => sub {
$t->websocket_ok( '/store/page' )
->send_ok({ json => $data })
->message_ok
->json_message_is( { success => 1, message => 'Changes saved' } )
->json_message_is( { success => true, message => 'Changes saved' } )
->finish_ok;

# see that the changes are reflected
Expand Down Expand Up @@ -159,7 +160,7 @@ subtest 'Edit Main Navigation Menu' => sub {
$t->websocket_ok('/store/menu')
->send_ok({ json => $data })
->message_ok
->json_message_is( '/success' => 1 )
->json_message_is( '/success' => true )
->json_message_is( '/message' => 'Changes saved' )
->json_message_has( '/content' )
->finish_ok;
Expand All @@ -185,7 +186,7 @@ subtest 'Edit Main Navigation Menu' => sub {
$t->websocket_ok('/store/menu')
->send_ok({ json => $data })
->message_ok
->json_message_is( '/success' => 1 )
->json_message_is( '/success' => true )
->json_message_is( '/message' => 'Changes saved' )
->json_message_has( '/content' )
->finish_ok;
Expand Down Expand Up @@ -230,21 +231,21 @@ subtest 'Administrative Overview: All Pages' => sub {
$t->websocket_ok('/remove/page')
->send_ok({ json => {id => 1} })
->message_ok
->json_message_is( { success => 0, message => 'Cannot remove home page' } )
->json_message_is( { success => false, message => 'Cannot remove home page' } )
->finish_ok;

# attempt to remove invalid page
$t->websocket_ok('/remove/page')
->send_ok({ json => {id => 5} })
->message_ok
->json_message_is( { success => 0, message => 'Could not access page (id 5)' } )
->json_message_is( { success => false, message => 'Could not access page (id 5)' } )
->finish_ok;

# remove page
$t->websocket_ok('/remove/page')
->send_ok({ json => {id => 2} })
->message_ok
->json_message_is( { success => 1, message => 'Page removed' } )
->json_message_is( { success => true, message => 'Page removed' } )
->finish_ok;

};
Expand All @@ -262,13 +263,13 @@ subtest 'Administer Users' => sub {
my $data = {
name => "admin",
full => "New Name",
is_author => 1,
is_admin => 1,
is_author => true,
is_admin => true,
};
$t->websocket_ok('/store/user')
->send_ok({ json => $data })
->message_ok
->json_message_is( { success => 1, message => 'Changes saved' } )
->json_message_is( { success => true, message => 'Changes saved' } )
->finish_ok;

# check that the name change is reflected
Expand All @@ -283,13 +284,13 @@ subtest 'Administer Users' => sub {
full => "New Name",
pass1 => 'newpass',
pass2 => 'wrongpass',
is_author => 1,
is_admin => 1,
is_author => true,
is_admin => true,
};
$t->websocket_ok('/store/user')
->send_ok({ json => $data })
->message_ok
->json_message_is( { success => 0, message => 'Not saved! Passwords do not match' } )
->json_message_is( { success => false, message => 'Not saved! Passwords do not match' } )
->finish_ok;

ok( $t->app->get_user('admin')->check_password('pass'), 'Password not changed on non-matching passwords');
Expand All @@ -300,13 +301,13 @@ subtest 'Administer Users' => sub {
full => "New Name",
pass1 => 'newpass',
pass2 => 'newpass',
is_author => 1,
is_admin => 1,
is_author => true,
is_admin => true,
};
$t->websocket_ok('/store/user')
->send_ok({ json => $data })
->message_ok
->json_message_is( { success => 1, message => 'Changes saved' } )
->json_message_is( { success => true, message => 'Changes saved' } )
->finish_ok;

ok( $t->app->get_user('admin')->check_password('newpass'), 'New password checks out');
Expand All @@ -319,13 +320,13 @@ subtest 'Create New User' => sub {
my $data = {
name => "someone",
full => "Jane ☃ Dow",
is_author => 1,
is_admin => 0,
is_author => true,
is_admin => false,
};
$t->websocket_ok('/store/user')
->send_ok({ json => $data })
->message_ok
->json_message_is( { success => 0, message => 'Cannot create user without a password' } )
->json_message_is( { success => false, message => 'Cannot create user without a password' } )
->finish_ok;

# create a user
Expand All @@ -334,13 +335,13 @@ subtest 'Create New User' => sub {
full => "Jane ☃ Doe",
pass1 => 'mypass',
pass2 => 'mypass',
is_author => 1,
is_admin => 0,
is_author => true,
is_admin => false,
};
$t->websocket_ok('/store/user')
->send_ok({ json => $data })
->message_ok
->json_message_is( { success => 1, message => 'Changes saved' } )
->json_message_is( { success => true, message => 'Changes saved' } )
->finish_ok;

# check the new user
Expand Down
3 changes: 2 additions & 1 deletion t/commands.t
View file
Expand Up @@ -10,6 +10,7 @@ use Mojolicious::Commands;
use Mojo::Util qw/ decode encode slurp /;
use File::Spec;
use File::Temp ();
use Mojo::JSON qw/true false/;

# dump
subtest 'Dump' => sub {
Expand Down Expand Up @@ -81,7 +82,7 @@ subtest 'Dump' => sub {
$t->websocket_ok( '/store/page' )
->send_ok({ json => $data })
->message_ok
->json_message_is( { success => 1, message => 'Changes saved' } )
->json_message_is( { success => true, message => 'Changes saved' } )
->finish_ok;

# see that the changes are reflected
Expand Down
9 changes: 5 additions & 4 deletions t/locations.t
View file
Expand Up @@ -5,6 +5,7 @@ use Galileo::DB::Deploy;

use Test::More;
use Test::Mojo;
use Mojo::JSON qw/true false/;

my $home = $ENV{GALILEO_HOME} = File::Spec->rel2abs(File::Spec->catdir( qw/ t locations / ));

Expand All @@ -28,7 +29,7 @@ my $image2 = File::Spec->catfile( qw/ img image2.jpg / );
$t->websocket_ok('/files/list')
->send_ok({ json => {limit => 0} })
->message_ok
->json_message_is( { files => [sort 'image1.jpg', $image2], finished => 1 } )
->json_message_is( { files => [sort 'image1.jpg', $image2], finished => true } )
->finish_ok;

# test limited number of files found. note order is not guaranteed
Expand All @@ -37,15 +38,15 @@ $t->websocket_ok('/files/list')
->message_ok
->json_message_has( '/files/0' )
->json_message_hasnt( '/files/1' )
->json_message_is( '/finished' => 0 )
->json_message_is( '/finished' => false )
->send_ok({ json => {limit => 1} })
->message_ok
->json_message_has( '/files/0' )
->json_message_hasnt( '/files/1' )
->json_message_is( '/finished' => 0 )
->json_message_is( '/finished' => false )
->send_ok({ json => {limit => 1} })
->message_ok
->json_message_is( { files => [], finished => 1 } )
->json_message_is( { files => [], finished => true } )
->finish_ok;

done_testing();
Expand Down

0 comments on commit 651a833

Please sign in to comment.