Use containerMenu as a base for HintMenu instead of regular menu
Change-Id: Ic1ed2e216a9c61aabf1f1cac41972b1a4e96a91a
diff --git a/t/plugin/csp.t b/t/plugin/csp.t
index aa6cd70..967af84 100644
--- a/t/plugin/csp.t
+++ b/t/plugin/csp.t
@@ -148,12 +148,16 @@
$content =~ q!<script nonce="(.{20})"!;
like($content, qr/nonce-\Q$1\E/);
+<<<<<<< HEAD
+=======
+>>>>>>> Use containerMenu as a base for HintMenu instead of regular menu
# Disable csp
$t = Test::Mojo->new(Mojolicious::Lite->new);
$t->app->plugin('Kalamar::Plugin::CSP' => {
'-disable' => 1
});
+<<<<<<< HEAD
$t->app->routes->get('/' => sub {
shift->render(text => 'hello world');
@@ -162,6 +166,13 @@
$t->app->csp->add('script-src', '*');
is($t->app->csp_nonce_tag,'');
+=======
+$t->app->routes->get('/' => sub {
+ shift->render(text => 'hello world');
+});
+$t->app->csp->add('script-src', '*');
+is($t->app->csp_nonce_tag,'');
+>>>>>>> Use containerMenu as a base for HintMenu instead of regular menu
$t->get_ok('/')
->status_is(200)
->content_is('hello world')
diff --git a/t/plugin/demo_server.t b/t/plugin/demo_server.t
index 1b2b524..da8c4ad 100644
--- a/t/plugin/demo_server.t
+++ b/t/plugin/demo_server.t
@@ -1,25 +1,43 @@
+<<<<<<< HEAD
use Mojo::Base -strict;
use Test::More;
use Test::Mojo;
+=======
+
+use Mojo::Base -strict;
+use Test::More;
+use Test::Mojo;
+>>>>>>> Use containerMenu as a base for HintMenu instead of regular menu
# Test the documentation
my $t = Test::Mojo->new('Kalamar' => {
Kalamar => {
plugins => ['DemoServer']
}
});
+<<<<<<< HEAD
+=======
+>>>>>>> Use containerMenu as a base for HintMenu instead of regular menu
$t->get_ok('/demo/all.html')
->status_is(200)
->content_type_is('text/html;charset=UTF-8')
->text_is('title', 'Complete Demo')
;
+<<<<<<< HEAD
+=======
+>>>>>>> Use containerMenu as a base for HintMenu instead of regular menu
$t->get_ok('/demo/alldemo.js')
->status_is(200)
->content_type_is('application/javascript')
->content_like(qr!'app/en'!)
;
+<<<<<<< HEAD
done_testing;
__END__
+=======
+done_testing;
+__END__
+>>>>>>> Use containerMenu as a base for HintMenu instead of regular menu