Merge pull request stringer-rss#457 from pascalw/fix-mocha-tests

Fix mocha tests

Author: gabrielpoca

.tool-versions

@@ -0,0 +1 @@
+ruby 2.3.3

.travis.yml

@@ -2,7 +2,7 @@ before_install:
   - gem update bundler
   - 'echo "RUBY_VERSION: $RUBY_VERSION"'
 before_script:
-  - npm install -g mocha-phantomjs@2.0.2
+  - npm install -g mocha-phantomjs@4.1.0
   - bundle exec rake test_js &> /dev/null &
   - sleep 5
 cache: bundler

spec/javascript/support/vendor/css/mocha.css

@@ -1,11 +1,16 @@
 @charset "utf-8";
 
 body {
+  margin:0;
+}
+
+#mocha {
   font: 20px/1.5 "Helvetica Neue", Helvetica, Arial, sans-serif;
-  padding: 60px 50px;
+  margin: 60px 50px;
 }
 
-#mocha ul, #mocha li {
+#mocha ul,
+#mocha li {
   margin: 0;
   padding: 0;
 }
@@ -14,7 +19,8 @@ body {
   list-style: none;
 }
 
-#mocha h1, #mocha h2 {
+#mocha h1,
+#mocha h2 {
   margin: 0;
 }
 
@@ -38,7 +44,7 @@ body {
   font-size: .8em;
 }
 
-.hidden {
+#mocha .hidden {
   display: none;
 }
 
@@ -59,15 +65,15 @@ body {
 
 #mocha .test.pending:hover h2::after {
   content: '(pending)';
-  font-family: arial;
+  font-family: arial, sans-serif;
 }
 
 #mocha .test.pass.medium .duration {
-  background: #C09853;
+  background: #c09853;
 }
 
 #mocha .test.pass.slow .duration {
-  background: #B94A48;
+  background: #b94a48;
 }
 
 #mocha .test.pass::before {
@@ -83,7 +89,7 @@ body {
   font-size: 9px;
   margin-left: 5px;
   padding: 2px 5px;
-  color: white;
+  color: #fff;
   -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.2);
   -moz-box-shadow: inset 0 1px 1px rgba(0,0,0,.2);
   box-shadow: inset 0 1px 1px rgba(0,0,0,.2);
@@ -128,23 +134,73 @@ body {
   color: #c00;
   max-height: 300px;
   overflow: auto;
-  max-width: 600px;
 }
 
-#mocha .test pre {
+#mocha .test .html-error {
+  overflow: auto;
+  color: black;
+  line-height: 1.5;
   display: block;
   float: left;
   clear: left;
   font: 12px/1.5 monaco, monospace;
   margin: 5px;
   padding: 15px;
   border: 1px solid #eee;
+  max-width: 85%; /*(1)*/
+  max-width: -webkit-calc(100% - 42px);
+  max-width: -moz-calc(100% - 42px);
+  max-width: calc(100% - 42px); /*(2)*/
+  max-height: 300px;
+  word-wrap: break-word;
   border-bottom-color: #ddd;
-  -webkit-border-radius: 3px;
   -webkit-box-shadow: 0 1px 3px #eee;
+  -moz-box-shadow: 0 1px 3px #eee;
+  box-shadow: 0 1px 3px #eee;
+  -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+
+#mocha .test .html-error pre.error {
+  border: none;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+  -webkit-box-shadow: 0;
+  -moz-box-shadow: 0;
+  box-shadow: 0;
+  padding: 0;
+  margin: 0;
+  margin-top: 18px;
+  max-height: none;
+}
+
+/**
+ * (1): approximate for browsers not supporting calc
+ * (2): 42 = 2*15 + 2*10 + 2*1 (padding + margin + border)
+ *      ^^ seriously
+ */
+#mocha .test pre {
+  display: block;
+  float: left;
+  clear: left;
+  font: 12px/1.5 monaco, monospace;
+  margin: 5px;
+  padding: 15px;
+  border: 1px solid #eee;
+  max-width: 85%; /*(1)*/
+  max-width: -webkit-calc(100% - 42px);
+  max-width: -moz-calc(100% - 42px);
+  max-width: calc(100% - 42px); /*(2)*/
+  word-wrap: break-word;
+  border-bottom-color: #ddd;
+  -webkit-box-shadow: 0 1px 3px #eee;
   -moz-box-shadow: 0 1px 3px #eee;
-  white-space: pre-wrap;
+  box-shadow: 0 1px 3px #eee;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
 }
 
 #mocha .test h2 {
@@ -164,10 +220,12 @@ body {
   text-align: center;
   background: #eee;
   font-size: 15px;
+  -webkit-border-radius: 15px;
   -moz-border-radius: 15px;
   border-radius: 15px;
-  -webkit-transition: opacity 200ms;
-  -moz-transition: opacity 200ms;
+  -webkit-transition:opacity 200ms;
+  -moz-transition:opacity 200ms;
+  -o-transition:opacity 200ms;
   transition: opacity 200ms;
   opacity: 0.3;
   color: #888;
@@ -185,9 +243,17 @@ body {
   display: none;
 }
 
+#mocha-report.pending .test.pass,
+#mocha-report.pending .test.fail {
+  display: none;
+}
+#mocha-report.pending .test.pass.pending {
+  display: block;
+}
+
 #mocha-error {
   color: #c00;
-  font-size: 1.5  em;
+  font-size: 1.5em;
   font-weight: 100;
   letter-spacing: 1px;
 }
@@ -199,11 +265,23 @@ body {
   font-size: 12px;
   margin: 0;
   color: #888;
+  z-index: 1;
 }
 
 #mocha-stats .progress {
   float: right;
   padding-top: 0;
+
+  /**
+   * Set safe initial values, so mochas .progress does not inherit these
+   * properties from Bootstrap .progress (which causes .progress height to
+   * equal line height set in Bootstrap).
+   */
+  height: auto;
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  box-shadow: none;
+  background-color: initial;
 }
 
 #mocha-stats em {
@@ -231,18 +309,18 @@ body {
   height: 40px;
 }
 
-code .comment { color: #ddd }
-code .init { color: #2F6FAD }
-code .string { color: #5890AD }
-code .keyword { color: #8A6343 }
-code .number { color: #2F6FAD }
+#mocha code .comment { color: #ddd; }
+#mocha code .init { color: #2f6fad; }
+#mocha code .string { color: #5890ad; }
+#mocha code .keyword { color: #8a6343; }
+#mocha code .number { color: #2f6fad; }
 
 @media screen and (max-device-width: 480px) {
-  body {
-    padding: 60px 0px;
+  #mocha {
+    margin: 60px 0px;
   }
 
-  #stats {
+  #mocha #stats {
     position: absolute;
   }
 }