Flatten and update GitHub tab component props

Author: smashwilson

lib/containers/github-tab-container.js

@@ -16,6 +16,9 @@ export default class GitHubTabContainer extends React.Component {
     loginModel: GithubLoginModelPropType.isRequired,
     rootHolder: RefHolderPropType.isRequired,
 
+    changeWorkingDirectory: PropTypes.func.isRequired,
+    onDidChangeWorkDirs: PropTypes.func.isRequired,
+    getCurrentWorkDirs: PropTypes.func.isRequired,
     openCreateDialog: PropTypes.func.isRequired,
     openPublishDialog: PropTypes.func.isRequired,
     openCloneDialog: PropTypes.func.isRequired,

lib/items/github-tab-item.js

@@ -13,6 +13,9 @@ export default class GitHubTabItem extends React.Component {
 
     documentActiveElement: PropTypes.func,
 
+    changeWorkingDirectory: PropTypes.func.isRequired,
+    onDidChangeWorkDirs: PropTypes.func.isRequired,
+    getCurrentWorkDirs: PropTypes.func.isRequired,
     openCreateDialog: PropTypes.func.isRequired,
     openPublishDialog: PropTypes.func.isRequired,
     openCloneDialog: PropTypes.func.isRequired,

test/containers/github-tab-container.test.js

@@ -4,28 +4,46 @@ import {mount} from 'enzyme';
 import {cloneRepository} from '../helpers';
 import GitHubTabContainer from '../../lib/containers/github-tab-container';
 import Repository from '../../lib/models/repository';
-import {gitHubTabContainerProps} from '../fixtures/props/github-tab-props';
+import {InMemoryStrategy} from '../../lib/shared/keytar-strategy';
+import GithubLoginModel from '../../lib/models/github-login-model';
+import RefHolder from '../../lib/models/ref-holder';
 
 describe('GitHubTabContainer', function() {
-  let atomEnv;
+  let atomEnv, repository;
 
   beforeEach(function() {
     atomEnv = global.buildAtomEnvironment();
+    repository = Repository.absent();
   });
 
   afterEach(function() {
     atomEnv.destroy();
   });
 
-  function buildApp(overrideProps = {}) {
-    const repository = Repository.absent();
-    return <GitHubTabContainer {...gitHubTabContainerProps(atomEnv, repository, overrideProps)} />;
+  function buildApp(props = {}) {
+    return (
+      <GitHubTabContainer
+        workspace={atomEnv.workspace}
+        repository={repository}
+        loginModel={new GithubLoginModel(InMemoryStrategy)}
+        rootHolder={new RefHolder()}
+
+        changeWorkingDirectory={() => {}}
+        onDidChangeWorkDirs={() => {}}
+        getCurrentWorkDirs={() => []}
+        openCreateDialog={() => {}}
+        openPublishDialog={() => {}}
+        openCloneDialog={() => {}}
+        openGitTab={() => {}}
+
+        {...props}
+      />
+    );
   }
 
   describe('operation state observer', function() {
     it('creates an observer on the current repository', function() {
-      const repository = Repository.absent();
-      const wrapper = mount(buildApp({repository}));
+      const wrapper = mount(buildApp());
 
       const observer = wrapper.state('remoteOperationObserver');
       assert.strictEqual(observer.repository, repository);
@@ -48,9 +66,9 @@ describe('GitHubTabContainer', function() {
 
   describe('while loading', function() {
     it('passes isLoading to its view', async function() {
-      const repository = new Repository(await cloneRepository());
-      assert.isTrue(repository.isLoading());
-      const wrapper = mount(buildApp({repository}));
+      const loadingRepo = new Repository(await cloneRepository());
+      assert.isTrue(loadingRepo.isLoading());
+      const wrapper = mount(buildApp({repository: loadingRepo}));
 
       assert.isTrue(wrapper.find('GitHubTabController').prop('isLoading'));
     });
@@ -59,9 +77,9 @@ describe('GitHubTabContainer', function() {
   describe('once loaded', function() {
     it('renders the controller', async function() {
       const workdir = await cloneRepository();
-      const repository = new Repository(workdir);
-      await repository.getLoadPromise();
-      const wrapper = mount(buildApp({repository}));
+      const presentRepo = new Repository(workdir);
+      await presentRepo.getLoadPromise();
+      const wrapper = mount(buildApp({repository: presentRepo}));
 
       await assert.async.isFalse(wrapper.update().find('GitHubTabController').prop('isLoading'));
       assert.strictEqual(wrapper.find('GitHubTabController').prop('workingDirectory'), workdir);

test/controllers/github-tab-controller.test.js

@@ -1,32 +1,60 @@
 import React from 'react';
 import {shallow} from 'enzyme';
 
-import {gitHubTabControllerProps} from '../fixtures/props/github-tab-props';
 import GitHubTabController from '../../lib/controllers/github-tab-controller';
 import Repository from '../../lib/models/repository';
 import BranchSet from '../../lib/models/branch-set';
 import Branch, {nullBranch} from '../../lib/models/branch';
 import RemoteSet from '../../lib/models/remote-set';
 import Remote from '../../lib/models/remote';
+import {InMemoryStrategy} from '../../lib/shared/keytar-strategy';
+import GithubLoginModel from '../../lib/models/github-login-model';
+import RefHolder from '../../lib/models/ref-holder';
+import OperationStateObserver, {PUSH, PULL, FETCH} from '../../lib/models/operation-state-observer';
+
+import {buildRepository, cloneRepository} from '../helpers';
 
 describe('GitHubTabController', function() {
-  let atomEnv;
+  let atomEnv, repository;
 
-  beforeEach(function() {
+  beforeEach(async function() {
     atomEnv = global.buildAtomEnvironment();
+    repository = await buildRepository(await cloneRepository());
   });
 
   afterEach(function() {
     atomEnv.destroy();
   });
 
-  function buildApp(overrideProps = {}) {
-    const props = {
-      repository: Repository.absent(),
-      ...overrideProps,
-    };
-
-    return <GitHubTabController {...gitHubTabControllerProps(atomEnv, props.repository, props)} />;
+  function buildApp(props = {}) {
+    const repo = props.repository || repository;
+
+    return (
+      <GitHubTabController
+        workspace={atomEnv.workspace}
+        remoteOperationObserver={new OperationStateObserver(repo, PUSH, PULL, FETCH)}
+        loginModel={new GithubLoginModel(InMemoryStrategy)}
+        rootHolder={new RefHolder()}
+
+        workingDirectory={repo.getWorkingDirectoryPath()}
+        repository={repo}
+        allRemotes={new RemoteSet()}
+        branches={new BranchSet()}
+        pushInProgress={false}
+        isLoading={false}
+        currentWorkDir={repo.getWorkingDirectoryPath()}
+
+        changeWorkingDirectory={() => {}}
+        onDidChangeWorkDirs={() => {}}
+        getCurrentWorkDirs={() => []}
+        openCreateDialog={() => {}}
+        openPublishDialog={() => {}}
+        openCloneDialog={() => {}}
+        openGitTab={() => {}}
+
+        {...props}
+      />
+    );
   }
 
   describe('derived view props', function() {

test/fixtures/props/github-tab-props.js

@@ -3,8 +3,10 @@ import {mount} from 'enzyme';
 
 import PaneItem from '../../lib/atom/pane-item';
 import GitHubTabItem from '../../lib/items/github-tab-item';
+import GithubLoginModel from '../../lib/models/github-login-model';
+import {InMemoryStrategy} from '../../lib/shared/keytar-strategy';
+
 import {cloneRepository, buildRepository} from '../helpers';
-import {gitHubTabItemProps} from '../fixtures/props/github-tab-props';
 
 describe('GitHubTabItem', function() {
   let atomEnv, repository;
@@ -20,14 +22,26 @@ describe('GitHubTabItem', function() {
     atomEnv.destroy();
   });
 
-  function buildApp(overrideProps = {}) {
-    const props = gitHubTabItemProps(atomEnv, repository, overrideProps);
+  function buildApp(props = {}) {
+    const workspace = props.workspace || atomEnv.workspace;
 
     return (
-      <PaneItem workspace={props.workspace} uriPattern={GitHubTabItem.uriPattern}>
+      <PaneItem workspace={workspace} uriPattern={GitHubTabItem.uriPattern}>
         {({itemHolder}) => (
           <GitHubTabItem
             ref={itemHolder.setter}
+
+            workspace={workspace}
+            repository={repository}
+            loginModel={new GithubLoginModel(InMemoryStrategy)}
+
+            changeWorkingDirectory={() => {}}
+            onDidChangeWorkDirs={() => {}}
+            getCurrentWorkDirs={() => []}
+            openCreateDialog={() => {}}
+            openPublishDialog={() => {}}
+            openCloneDialog={() => {}}
+            openGitTab={() => {}}
             {...props}
           />
         )}

test/items/github-tab-item.test.js

@@ -2,12 +2,16 @@ import React from 'react';
 import {shallow} from 'enzyme';
 import temp from 'temp';
 
-import {gitHubTabViewProps} from '../fixtures/props/github-tab-props';
 import Repository from '../../lib/models/repository';
 import Remote, {nullRemote} from '../../lib/models/remote';
 import RemoteSet from '../../lib/models/remote-set';
-import Branch from '../../lib/models/branch';
+import Branch, {nullBranch} from '../../lib/models/branch';
+import BranchSet from '../../lib/models/branch-set';
 import GitHubTabView from '../../lib/views/github-tab-view';
+import {InMemoryStrategy} from '../../lib/shared/keytar-strategy';
+import GithubLoginModel from '../../lib/models/github-login-model';
+import RefHolder from '../../lib/models/ref-holder';
+import OperationStateObserver, {PUSH, PULL, FETCH} from '../../lib/models/operation-state-observer';
 
 import {buildRepository, cloneRepository} from '../helpers';
 
@@ -22,9 +26,39 @@ describe('GitHubTabView', function() {
     atomEnv.destroy();
   });
 
-  function buildApp(overrideProps = {}) {
-    const props = gitHubTabViewProps(atomEnv, overrideProps.repository || Repository.absent(), overrideProps);
-    return <GitHubTabView {...props} />;
+  function buildApp(props) {
+    const repo = props.repository || Repository.absent();
+
+    return (
+      <GitHubTabView
+        workspace={atomEnv.workspace}
+        remoteOperationObserver={new OperationStateObserver(repo, PUSH, PULL, FETCH)}
+        loginModel={new GithubLoginModel(InMemoryStrategy)}
+        rootHolder={new RefHolder()}
+
+        workingDirectory={repo.getWorkingDirectoryPath()}
+        repository={repo}
+        branches={new BranchSet()}
+        currentBranch={nullBranch}
+        remotes={new RemoteSet()}
+        currentRemote={nullRemote}
+        manyRemotesAvailable={false}
+        pushInProgress={false}
+        isLoading={false}
+
+        handlePushBranch={() => {}}
+        handleRemoteSelect={() => {}}
+        changeWorkingDirectory={() => {}}
+        onDidChangeWorkDirs={() => {}}
+        getCurrentWorkDirs={() => []}
+        openCreateDialog={() => {}}
+        openPublishDialog={() => {}}
+        openCloneDialog={() => {}}
+        openGitTab={() => {}}
+
+        {...props}
+      />
+    );
   }
 
   it('renders a LoadingView if data is still loading', function() {