[Tests] Make tests pass

Author: ide

src/MacAddresses.js

@@ -1,7 +1,7 @@
 // @flow
 import padStart from 'lodash/padStart';
 
-let MacAddresses = {
+const MacAddresses = {
  getEthernetSource(packet): string {
  return MacAddresses.decimalToHex(packet.payload.shost.addr);
  },

src/__mocks__/pcap.js

@@ -1,6 +1,16 @@
+import events from 'events';
+
 let pcap = require.requireActual('pcap');
 
 let pcapMock = jest.genMockFromModule('pcap');
 pcapMock.decode = pcap.decode;
 
+pcapMock.createSession.mockImplementation((interfaceName, filter = '') => {
+ let session = new events.EventEmitter();
+ session.device_name = interfaceName;
+ session.filter = filter;
+ session.close = jest.genMockFunction();
+ return session;
+});
+
 export default pcapMock;

src/__tests__/DashButton-test.js

@@ -17,7 +17,6 @@ describe('DashButton', () => {
  DashButton = require('../DashButton');
  NetworkInterfaces = require('../NetworkInterfaces');
 
- pcap.createSession.mockImplementation(() => createMockPcapSession());
  NetworkInterfaces.getDefault.mockReturnValue(NETWORK_INTERFACE);
  });
 
@@ -42,9 +41,25 @@ describe('DashButton', () => {
  expect(pcap.createSession.mock.calls.length).toBe(1);
  });
 
+ it(`creates a pcap session on the default interface`, () => {
+ let button = new DashButton(MAC_ADDRESS);
+ button.addListener(() => {});
+
+ expect(pcap.createSession.mock.calls.length).toBe(1);
+ expect(pcap.createSession.mock.calls[0][0]).toBe(NETWORK_INTERFACE);
+ });
+
+ it(`creates a pcap session on the specified interface`, () => {
+ let button = new DashButton(MAC_ADDRESS, { networkInterface: 'wlan0' });
+ button.addListener(() => {});
+
+ expect(pcap.createSession.mock.calls.length).toBe(1);
+ expect(pcap.createSession.mock.calls[0][0]).toBe('wlan0');
+ });
+
  it(`notifies the appropriate listeners for each packet`, () => {
- let mockSession = createMockPcapSession();
- pcap.createSession.mockReturnValue(mockSession);
+ let mockSession = pcap.createSession(NetworkInterfaces.getDefault());
+ pcap.createSession.mockReturnValueOnce(mockSession);
 
  let button1Listener = jest.genMockFunction();
  let button2Listener = jest.genMockFunction();
@@ -67,15 +82,15 @@ describe('DashButton', () => {
 
  it(`waits for listeners for a prior packet to asynchronously complete ` +
  `before handling any new packets`, async () => {
- let mockSession = createMockPcapSession();
+ let mockSession = pcap.createSession(NetworkInterfaces.getDefault());
  let listenerCompletion = null;
  let originalAddListener = mockSession.addListener;
  mockSession.addListener = function addListener(eventName, listener) {
  originalAddListener.call(this, eventName, function(...args) {
  listenerCompletion = listener.apply(this, args);
  });
  };
- pcap.createSession.mockReturnValue(mockSession);
+ pcap.createSession.mockReturnValueOnce(mockSession);
 
  let button = new DashButton(MAC_ADDRESS);
  let calls = 0;
@@ -93,8 +108,8 @@ describe('DashButton', () => {
  });
 
  it(`waits for all listeners even if some threw an error`, async () => {
- let mockSession = createMockPcapSession();
- pcap.createSession.mockReturnValue(mockSession);
+ let mockSession = pcap.createSession(NetworkInterfaces.getDefault());
+ pcap.createSession.mockReturnValueOnce(mockSession);
 
  let button = new DashButton(MAC_ADDRESS);
  let errorCount = 0;
@@ -128,8 +143,8 @@ describe('DashButton', () => {
  });
 
  it(`runs its async listeners concurrently`, () => {
- let mockSession = createMockPcapSession();
- pcap.createSession.mockReturnValue(mockSession);
+ let mockSession = pcap.createSession(NetworkInterfaces.getDefault());
+ pcap.createSession.mockReturnValueOnce(mockSession);
 
  let button = new DashButton(MAC_ADDRESS);
  let calls = 0;
@@ -149,8 +164,8 @@ describe('DashButton', () => {
  });
 
  it(`removes packet listeners when a button has no more listeners`, () => {
- let mockSession = createMockPcapSession();
- pcap.createSession.mockReturnValue(mockSession);
+ let mockSession = pcap.createSession(NetworkInterfaces.getDefault());
+ pcap.createSession.mockReturnValueOnce(mockSession);
 
  let button = new DashButton(MAC_ADDRESS);
  let subscription1 = button.addListener(() => {});
@@ -164,8 +179,8 @@ describe('DashButton', () => {
  });
 
  it(`doesn't throw if you remove a subscription twice`, () => {
- let mockSession = createMockPcapSession();
- pcap.createSession.mockReturnValue(mockSession);
+ let mockSession = pcap.createSession(NetworkInterfaces.getDefault());
+ pcap.createSession.mockReturnValueOnce(mockSession);
 
  let button = new DashButton(MAC_ADDRESS);
  let subscription = button.addListener(() => {});
@@ -176,8 +191,8 @@ describe('DashButton', () => {
  });
 
  it(`closes the pcap session when no more buttons are listening`, () => {
- let mockSession = createMockPcapSession();
- pcap.createSession.mockReturnValue(mockSession);
+ let mockSession = pcap.createSession(NetworkInterfaces.getDefault());
+ pcap.createSession.mockReturnValueOnce(mockSession);
 
  let button1Listener = jest.genMockFunction();
  let button2Listener = jest.genMockFunction();
@@ -194,12 +209,6 @@ describe('DashButton', () => {
  });
 });
 
-function createMockPcapSession() {
- let session = new events.EventEmitter();
- session.close = jest.genMockFunction();
- return session;
-}
-
 function createMockArpProbe(sourceMacAddress) {
  let decimals = sourceMacAddress.split(':').map(hex => parseInt(hex, 16));
  assert(decimals.length === 6, 'MAC addresses must be six bytes');

yarn.lock

@@ -963,9 +963,9 @@ eslint-plugin-babel@^4.0.0:
  version "4.0.0"
  resolved "https://registry.yarnpkg.com/eslint-plugin-babel/-/eslint-plugin-babel-4.0.0.tgz#a92114e2c493ac3034b030d7ecf96e174a76ef3f"
 
-eslint-plugin-flowtype@^2.25.0:
- version "2.25.0"
- resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.25.0.tgz#c462521ab20ce3d8db819f10ad3c9f1bc7f3f819"
+eslint-plugin-flowtype@^2.26.1:
+ version "2.29.1"
+ resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.29.1.tgz#74cc5603ff0baff6e224482bbd17406b0980f6c3"
  dependencies:
  lodash "^4.15.0"
 
@@ -984,9 +984,9 @@ eslint-plugin-import@^2.2.0:
  minimatch "^3.0.3"
  pkg-up "^1.0.0"
 
-eslint@^3.10.0:
- version "3.10.2"
- resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.10.2.tgz#c9a10e8bf6e9d65651204778c503341f1eac3ce7"
+eslint@^3.11.0:
+ version "3.11.1"
+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.11.1.tgz#408be581041385cba947cd8d1cd2227782b55dbf"
  dependencies:
  babel-code-frame "^6.16.0"
  chalk "^1.1.3"