Tidy up tests and code.

oskarhane · oskarhane · commit ec2a3cb4d9c3 · 2015-10-27T10:54:39.000+01:00
- Add Content-Type meta tag to test document
  Manual tests could have utf8 difficulties without it
  because browsers could interpet strings as other encodings.
- Fix test naming to be more clear.
- Tidy up code: remove tmp variable.
diff --git a/gulpfile.js b/gulpfile.js
@@ -79,8 +79,6 @@ gulp.task('build-browser-test', function(){
         })
         .on('error', gutil.log)
         .pipe(source('neo4j-web.test.js'))
-        .pipe(buffer())
-        .pipe(uglify())
         .pipe(gulp.dest(browserOutput))
     },
     function(cb) {
diff --git a/lib/internal/utf8.js b/lib/internal/utf8.js
@@ -90,6 +90,7 @@ try {
 
 let streamDecodeCombinedBuffer = (combinedBuffers, length, decodeFn, endFn) => {
   let remainingBytesToRead = length;
+  // Reduce CombinedBuffers to a decoded string
   let out = combinedBuffers.reduce(function(last, partBuffer){
     if(remainingBytesToRead <= 0) {
       return last;
@@ -101,8 +102,7 @@ let streamDecodeCombinedBuffer = (combinedBuffers, length, decodeFn, endFn) => {
       return last + decodeFn(lastSlice);
     }
     remainingBytesToRead -= partBuffer.length;
-    let tmp = decodeFn(partBuffer);
-    return last + tmp;
+    return last + decodeFn(partBuffer);
   }, '');
   return out + endFn();
 }
diff --git a/test/browser/testrunner-phantomjs.html b/test/browser/testrunner-phantomjs.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>Jasmine Test Runner</title>
 
   <link rel="shortcut icon" type="image/png" href="jasmine/lib/jasmine-2.0.3/jasmine_favicon.png">
diff --git a/test/internal/utf8.test.js b/test/internal/utf8.test.js
@@ -16,7 +16,7 @@ describe('utf8', function() {
     expect( packAndUnpack( "åäö123" ) ).toBe( "åäö123"  );
   });
 
-  it('should read/write utf8 from a complete combined buffer', function() {
+  it('should decode utf8 from a complete combined buffer', function() {
     // Given
     var msg = "asåfqwer";
     var buf = utf8.encode(msg);
@@ -32,7 +32,7 @@ describe('utf8', function() {
     expect(decoded).toBe(msg);
   });
 
-  it('should read/write utf8 from part of a combined buffer', function() {
+  it('should decode utf8 from part of a combined buffer', function() {
     // Given
     var msg = "asåfq";
     var expectMsg = msg.substring(0, msg.length-1);
