From 7d1c5d1ac6f660c800c9c8de9943cfe9dff41d83 Mon Sep 17 00:00:00 2001
From: Daniel Imms <daimms@microsoft.com>
Date: Sat, 5 Aug 2017 02:34:21 -0700
Subject: [PATCH] Fix tests

---
 src/Buffer.test.ts                | 4 +++-
 src/BufferSet.test.ts             | 4 +++-
 src/Terminal.ts                   | 2 +-
 src/Viewport.test.ts              | 4 +++-
 src/test/escape-sequences-test.js | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/Buffer.test.ts b/src/Buffer.test.ts
index c4c3a267..9f0d8446 100644
--- a/src/Buffer.test.ts
+++ b/src/Buffer.test.ts
@@ -14,7 +14,9 @@ describe('Buffer', () => {
     terminal = <any>{
       cols: 80,
       rows: 24,
-      scrollback: 1000
+      options: {
+        scrollback: 1000
+      }
     };
     buffer = new Buffer(terminal);
   });
diff --git a/src/BufferSet.test.ts b/src/BufferSet.test.ts
index 2101fbc1..19d943b9 100644
--- a/src/BufferSet.test.ts
+++ b/src/BufferSet.test.ts
@@ -14,7 +14,9 @@ describe('BufferSet', () => {
     terminal = <any>{
       cols: 80,
       rows: 24,
-      scrollback: 1000
+      options: {
+        scrollback: 1000
+      }
     };
     bufferSet = new BufferSet(terminal);
   });
diff --git a/src/Terminal.ts b/src/Terminal.ts
index 509152b9..839ad568 100644
--- a/src/Terminal.ts
+++ b/src/Terminal.ts
@@ -779,7 +779,7 @@ export class Terminal extends EventEmitter implements ITerminal {
    * @param {string} addon The name of the addon to load
    * @static
    */
-  public loadAddon(addon, callback) {
+  public static loadAddon(addon, callback) {
     if (typeof exports === 'object' && typeof module === 'object') {
       // CommonJS
       return require('./addons/' + addon + '/' + addon);
diff --git a/src/Viewport.test.ts b/src/Viewport.test.ts
index 6d09ea86..7c89da29 100644
--- a/src/Viewport.test.ts
+++ b/src/Viewport.test.ts
@@ -26,7 +26,9 @@ describe('Viewport', () => {
           height: 0
         }
       },
-      scrollback: 10
+      options: {
+        scrollback: 10
+      }
     };
     terminal.buffers = new BufferSet(terminal);
     terminal.buffer = terminal.buffers.active;
diff --git a/src/test/escape-sequences-test.js b/src/test/escape-sequences-test.js
index b4a53a17..d0447451 100644
--- a/src/test/escape-sequences-test.js
+++ b/src/test/escape-sequences-test.js
@@ -80,7 +80,7 @@ describe('xterm output comparison', function() {
   var xterm;
 
   beforeEach(function () {
-    xterm = new Terminal(COLS, ROWS);
+    xterm = new Terminal({ cols: COLS, rows: ROWS });
     xterm.refresh = function() {};
     xterm.viewport = {
       syncScrollArea: function() {}