Skip to content

Commit ef027bc

Browse files
authored
Merge pull request #76 from sorryforthecommit/fix_installation_as_root_fix
Fix bad plan skip_all in 01load.t
2 parents 2a1ba52 + 12b339e commit ef027bc

10 files changed

Lines changed: 22 additions & 21 deletions

File tree

t/01load.t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ use FindBin qw($Bin $RealBin);
99
use lib "$Bin/../../Gtk3-WebKit2/lib";
1010
use URI;
1111

12-
use_ok 'WWW::WebKit2';
13-
1412
#Running tests as root will sometimes spawn an X11 that cannot be closed automatically and leave the test hanging
1513
plan skip_all => 'Tests run as root may hang due to X11 server not closing.' unless $>;
1614

15+
use_ok 'WWW::WebKit2';
16+
1717
my $timeout = 1000;
1818

1919
my $sel= WWW::WebKit2->new(xvfb => 1);

t/drag_and_drop.t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ use FindBin qw($Bin $RealBin);
88
use lib "$Bin/../../Gtk3-WebKit2/lib";
99
use URI;
1010

11-
use_ok 'WWW::WebKit2';
12-
1311
#Running tests as root will sometimes spawn an X11 that cannot be closed automatically and leave the test hanging
1412
plan skip_all => 'Tests run as root may hang due to X11 server not closing.' unless $>;
1513

14+
use_ok 'WWW::WebKit2';
15+
1616
my $webkit = WWW::WebKit2->new(xvfb => 1);
1717
eval { $webkit->init; };
1818
if ($@ and $@ =~ /\ACould not start Xvfb/) {

t/drag_and_drop_mouse.t

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@ use FindBin qw($Bin $RealBin);
88
use lib "$Bin/../../Gtk3-WebKit2/lib";
99
use URI;
1010

11-
12-
use_ok 'WWW::WebKit2';
13-
1411
#Running tests as root will sometimes spawn an X11 that cannot be closed automatically and leave the test hanging
1512
plan skip_all => 'Tests run as root may hang due to X11 server not closing.' unless $>;
1613

14+
use_ok 'WWW::WebKit2';
15+
1716
my $webkit = WWW::WebKit2->new(xvfb => 1);
1817

1918
eval { $webkit->init; };
@@ -32,4 +31,4 @@ $webkit->open("$Bin/test/drag_and_drop.html");
3231
$webkit->mouse_input_drag_and_drop_to_object('id=dragme', 'id=target');
3332
ok($webkit->is_element_present('xpath=//div[@id="target"]//div[@id="dragme"]'), 'Element has been successfully dragged by the mouse');
3433

35-
done_testing;
34+
done_testing;

t/events.t

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ use lib "$Bin/../../Gtk3-WebKit2/lib";
1010
use Test::Fake::HTTPD;
1111
use URI;
1212

13-
use_ok 'WWW::WebKit2';
14-
1513
#Running tests as root will sometimes spawn an X11 that cannot be closed automatically and leave the test hanging
1614
plan skip_all => 'Tests run as root may hang due to X11 server not closing.' unless $>;
15+
16+
use_ok 'WWW::WebKit2';
17+
1718
my $webkit = WWW::WebKit2->new(xvfb => 1);
1819
eval { $webkit->init; };
1920
if ($@ and $@ =~ /\ACould not start Xvfb/) {

t/inspector.t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ use File::Slurper qw(read_text);
1010
use lib "$Bin/../../Gtk3-WebKit2/lib";
1111
use URI;
1212

13-
use_ok 'WWW::WebKit2';
14-
1513
#Running tests as root will sometimes spawn an X11 that cannot be closed automatically and leave the test hanging
1614
plan skip_all => 'Tests run as root may hang due to X11 server not closing.' unless $>;
1715

16+
use_ok 'WWW::WebKit2';
17+
1818
my $webkit = WWW::WebKit2->new(xvfb => 1);
1919
eval { $webkit->init; };
2020
if ($@ and $@ =~ /\ACould not start Xvfb/) {

t/keyboard.t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ use FindBin qw($Bin $RealBin);
88
use lib "$Bin/../../Gtk3-WebKit2/lib";
99
use URI;
1010

11-
use_ok 'WWW::WebKit2';
12-
1311
#Running tests as root will sometimes spawn an X11 that cannot be closed automatically and leave the test hanging
1412
plan skip_all => 'Tests run as root may hang due to X11 server not closing.' unless $>;
1513

14+
use_ok 'WWW::WebKit2';
15+
1616
my $webkit = WWW::WebKit2->new(xvfb => 1);
1717
eval { $webkit->init; };
1818
if ($@ and $@ =~ /\ACould not start Xvfb/) {

t/locator.t

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@ use FindBin qw($Bin $RealBin);
88
use lib "$Bin/../../Gtk3-WebKit2/lib";
99
use URI;
1010

11-
use_ok 'WWW::WebKit2';
1211

1312
#Running tests as root will sometimes spawn an X11 that cannot be closed automatically and leave the test hanging
1413
plan skip_all => 'Tests run as root may hang due to X11 server not closing.' unless $>;
1514

15+
use_ok 'WWW::WebKit2';
16+
1617
my $webkit = WWW::WebKit2->new(xvfb => 1);
1718
eval { $webkit->init; };
1819
if ($@ and $@ =~ /\ACould not start Xvfb/) {

t/logging.t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ use FindBin qw($Bin $RealBin);
1010
use lib "$Bin/../../Gtk3-WebKit2/lib";
1111
use URI;
1212

13-
use_ok 'WWW::WebKit2';
14-
1513
#Running tests as root will sometimes spawn an X11 that cannot be closed automatically and leave the test hanging
1614
plan skip_all => 'Tests run as root may hang due to X11 server not closing.' unless $>;
1715

16+
use_ok 'WWW::WebKit2';
17+
1818
my $dir = File::Temp->newdir();
1919

2020
# logging should be off by default

t/mouse.t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ use FindBin qw($Bin $RealBin);
88
use lib "$Bin/../../Gtk3-WebKit2/lib";
99
use URI;
1010

11-
use_ok 'WWW::WebKit2';
12-
1311
#Running tests as root will sometimes spawn an X11 that cannot be closed automatically and leave the test hanging
1412
plan skip_all => 'Tests run as root may hang due to X11 server not closing.' unless $>;
1513

14+
use_ok 'WWW::WebKit2';
15+
1616
my $webkit = WWW::WebKit2->new(xvfb => 1);
1717
eval { $webkit->init; };
1818
if ($@ and $@ =~ /\ACould not start Xvfb/) {

t/navigator.t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ use FindBin qw($Bin $RealBin);
88
use lib "$Bin/../../Gtk3-WebKit2/lib";
99
use URI;
1010

11-
use_ok 'WWW::WebKit2';
12-
1311
#Running tests as root will sometimes spawn an X11 that cannot be closed automatically and leave the test hanging
1412
plan skip_all => 'Tests run as root may hang due to X11 server not closing.' unless $>;
1513

14+
use_ok 'WWW::WebKit2';
15+
1616
my $webkit = WWW::WebKit2->new(xvfb => 1);
1717
eval { $webkit->init; };
1818
if ($@ and $@ =~ /\ACould not start Xvfb/) {

0 commit comments

Comments
 (0)