Correct unit tests

Author: fcollonval

src/components/NewBranchDialog.tsx

@@ -218,7 +218,7 @@ export class NewBranchDialog extends React.Component<
    * @returns array of React elements
    */
   private _renderItems(): JSX.Element {
-    const current = this.props.model.currentBranch.name;
+    const current = this.props.currentBranch;
     // Perform a "simple" filter... (TODO: consider implementing fuzzy filtering)
     const filter = this.state.filter;
     const branches = this.props.branches

tests/test-components/BranchMenu.spec.tsx

@@ -47,9 +47,6 @@ const BRANCHES = [
 
 async function createModel() {
   const model = new GitExtension('/server/root');
-
-  jest.spyOn(model, 'branches', 'get').mockReturnValue(BRANCHES);
-  jest.spyOn(model, 'currentBranch', 'get').mockReturnValue(BRANCHES[0]);
   model.pathRepository = '/path/to/repo';
 
   await model.ready;
@@ -82,6 +79,8 @@ describe('BranchMenu', () => {
   describe('constructor', () => {
     it('should return a new instance', () => {
       const props = {
+        currentBranch: BRANCHES[0].name,
+        branches: BRANCHES,
         model: model,
         branching: false,
         logger: new Logger(),
@@ -92,6 +91,8 @@ describe('BranchMenu', () => {
 
     it('should set the default menu filter to an empty string', () => {
       const props = {
+        currentBranch: BRANCHES[0].name,
+        branches: BRANCHES,
         model: model,
         branching: false,
         logger: new Logger(),
@@ -102,6 +103,8 @@ describe('BranchMenu', () => {
 
     it('should set the default flag indicating whether to show a dialog to create a new branch to `false`', () => {
       const props = {
+        currentBranch: BRANCHES[0].name,
+        branches: BRANCHES,
         model: model,
         branching: false,
         logger: new Logger(),
@@ -114,6 +117,8 @@ describe('BranchMenu', () => {
   describe('render', () => {
     it('should display placeholder text for the menu filter', () => {
       const props = {
+        currentBranch: BRANCHES[0].name,
+        branches: BRANCHES,
         model: model,
         branching: false,
         logger: new Logger(),
@@ -125,6 +130,8 @@ describe('BranchMenu', () => {
 
     it('should set a `title` attribute on the input element to filter a branch menu', () => {
       const props = {
+        currentBranch: BRANCHES[0].name,
+        branches: BRANCHES,
         model: model,
         branching: false,
         logger: new Logger(),
@@ -136,6 +143,8 @@ describe('BranchMenu', () => {
 
     it('should display a button to clear the menu filter once a filter is provided', () => {
       const props = {
+        currentBranch: BRANCHES[0].name,
+        branches: BRANCHES,
         model: model,
         branching: false,
         logger: new Logger(),
@@ -150,6 +159,8 @@ describe('BranchMenu', () => {
 
     it('should set a `title` on the button to clear the menu filter', () => {
       const props = {
+        currentBranch: BRANCHES[0].name,
+        branches: BRANCHES,
         model: model,
         branching: false,
         logger: new Logger(),
@@ -167,6 +178,8 @@ describe('BranchMenu', () => {
 
     it('should display a button to create a new branch', () => {
       const props = {
+        currentBranch: BRANCHES[0].name,
+        branches: BRANCHES,
         model: model,
         branching: false,
         logger: new Logger(),
@@ -178,6 +191,8 @@ describe('BranchMenu', () => {
 
     it('should set a `title` attribute on the button to create a new branch', () => {
       const props = {
+        currentBranch: BRANCHES[0].name,
+        branches: BRANCHES,
         model: model,
         branching: false,
         logger: new Logger(),
@@ -189,14 +204,16 @@ describe('BranchMenu', () => {
 
     it('should display a list of branches', () => {
       const props = {
+        currentBranch: BRANCHES[0].name,
+        branches: BRANCHES,
         model: model,
         branching: false,
         logger: new Logger(),
       };
       const component = render(<BranchMenu {...props} />);
       const nodes = component.find(`.${listItemClass}`);
 
-      const branches = model.branches;
+      const branches = BRANCHES;
       expect(nodes.length).toEqual(branches.length);
 
       // Should contain the branch names...
@@ -209,14 +226,16 @@ describe('BranchMenu', () => {
 
     it('should set a `title` attribute for each displayed branch', () => {
       const props = {
+        currentBranch: BRANCHES[0].name,
+        branches: BRANCHES,
         model: model,
         branching: false,
         logger: new Logger(),
       };
       const component = render(<BranchMenu {...props} />);
       const nodes = component.find(`.${listItemClass}`);
 
-      const branches = model.branches;
+      const branches = BRANCHES;
       expect(nodes.length).toEqual(branches.length);
 
       for (let i = 0; i < branches.length; i++) {
@@ -226,6 +245,8 @@ describe('BranchMenu', () => {
 
     it('should not, by default, show a dialog to create a new branch', () => {
       const props = {
+        currentBranch: BRANCHES[0].name,
+        branches: BRANCHES,
         model: model,
         branching: false,
         logger: new Logger(),
@@ -237,6 +258,8 @@ describe('BranchMenu', () => {
 
     it('should show a dialog to create a new branch when the flag indicating whether to show the dialog is `true`', () => {
       const props = {
+        currentBranch: BRANCHES[0].name,
+        branches: BRANCHES,
         model: model,
         branching: false,
         logger: new Logger(),
@@ -255,6 +278,8 @@ describe('BranchMenu', () => {
       const spy = jest.spyOn(GitExtension.prototype, 'checkout');
 
       const props = {
+        currentBranch: BRANCHES[0].name,
+        branches: BRANCHES,
         model: model,
         branching: false,
         logger: new Logger(),
@@ -271,6 +296,8 @@ describe('BranchMenu', () => {
       const spy = jest.spyOn(GitExtension.prototype, 'checkout');
 
       const props = {
+        currentBranch: BRANCHES[0].name,
+        branches: BRANCHES,
         model: model,
         branching: true,
         logger: new Logger(),
@@ -293,6 +320,8 @@ describe('BranchMenu', () => {
       const spy = jest.spyOn(GitExtension.prototype, 'checkout');
 
       const props = {
+        currentBranch: BRANCHES[0].name,
+        branches: BRANCHES,
         model: model,
         branching: false,
         logger: new Logger(),
@@ -311,6 +340,8 @@ describe('BranchMenu', () => {
       const spy = jest.spyOn(GitExtension.prototype, 'checkout');
 
       const props = {
+        currentBranch: BRANCHES[0].name,
+        branches: BRANCHES,
         model: model,
         branching: true,
         logger: new Logger(),