Fix tests for the fullscreen view_mode

6a462f6c · JC Brand · b751c066 · 6a462f6c · 6a462f6c · 6a462f6c
Commit 6a462f6c authored Jul 20, 2018 by JC Brand
Showing with 19 additions and 12 deletions

css/converse.css css/converse.css +1 -1

sass/_core.scss sass/_core.scss +1 -1

tests/fullpage.html tests/fullpage.html +12 -5

tests/index.html tests/index.html +3 -3

tests/runner.js tests/runner.js +2 -2

No files found.
--- a/css/converse.css
+++ b/css/converse.css
@@ -6872,7 +6872,7 @@ body.reset {
    flex-direction: row-reverse; }
  #conversejs.converse-fullscreen .converse-chatboxes, #conversejs.converse-mobile .converse-chatboxes {
    width: 100vw;
-    right: 15px; }
+    left: -15px; }
  #conversejs.converse-overlayed {
    height: 3em; }
  #conversejs .brand-heading {

--- a/sass/_core.scss
+++ b/sass/_core.scss
@@ -71,7 +71,7 @@ body.reset {
    &.converse-mobile {
        .converse-chatboxes {
            width: 100vw;
-            right: 15px; // Hack due to padding added by bootstrap
+            left: -15px; // Hack due to padding added by bootstrap
        }
    }
    &.converse-overlayed {

--- a/tests/inverse.html
+++ b/tests/inverse.html
@@ -2,16 +2,23 @@
  "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-    <title>Converse.js Tests</title>
-    <meta name="description" content="Converse.js: A chat client for your website" />
+    <title>Converse Tests</title>
+    <meta name="description" content="Converse XMPP Chat" />
    <link rel="shortcut icon" type="image/png" href="../node_modules/jasmine-core/images/jasmine_favicon.png">

    <link rel="stylesheet" type="text/css" media="screen" href="../node_modules/jasmine-core/lib/jasmine-core/jasmine.css">
-    <link type="text/css" rel="stylesheet" media="screen" href="../css/inverse.css" />
-
+    <link type="text/css" rel="stylesheet" media="screen" href="../node_modules/font-awesome/css/font-awesome.min.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="../css/converse.css" />
+    <script src="../dist/converse.js"></script>
    <script src="../src/config.js"></script>
-    <script type="text/javascript">config.view_mode = 'fullscreen';</script>
+    <script type="text/javascript">window.view_mode = 'fullscreen';</script>
    <script data-main="runner" src="../node_modules/requirejs/require.js"></script>
+    <style>
+        body {
+            overflow-y: hidden;
+        }
+    </style>
 </head>
+
 <body></body>
 </html>
--- a/tests/index.html
+++ b/tests/index.html
@@ -2,8 +2,8 @@
  "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-    <title>Converse.js Tests</title>
-    <meta name="description" content="Converse.js: A chat client for your website" />
+    <title>Converse Tests</title>
+    <meta name="description" content="Converse XMPP Chat" />
    <link rel="shortcut icon" type="image/png" href="../node_modules/jasmine-core/images/jasmine_favicon.png">

    <link rel="stylesheet" type="text/css" media="screen" href="../node_modules/jasmine-core/lib/jasmine-core/jasmine.css">
@@ -27,7 +27,7 @@
    <div id="header_wrap" class="outer">
        <header class="inner">
          <h1 class="brand-heading tests-brand-heading">
-              <i class="icon-conversejs"></i> Converse.js</h1>
+              <i class="icon-conversejs"></i> Converse</h1>
          <h2 id="project_tagline">Tests</h2>
        </header>
    </div>

--- a/tests/runner.js
+++ b/tests/runner.js
@@ -211,8 +211,8 @@ var specs = [
 require(['console-reporter', 'mock', 'sinon', 'wait-until-promise', 'pluggable'],
        function(ConsoleReporter, mock, sinon, waitUntilPromise, pluggable) {

-    if (config.view_mode) {
-        mock.view_mode = config.view_mode;
+    if (window.view_mode) {
+        mock.view_mode = window.view_mode;
    }
    window.sinon = sinon;
    window.waitUntilPromise = waitUntilPromise.default;