Shuffle some CSS class names a little

smashwilson · smashwilson · commit a6902cb9a522 · 2018-07-20T10:41:37.000-04:00
diff --git a/lib/controllers/root-controller.js b/lib/controllers/root-controller.js
@@ -292,7 +292,7 @@ export default class RootController extends React.Component {
         <PaneItem
           workspace={this.props.workspace}
           uriPattern={GitHubTabItem.uriPattern}
-          className="github-GithubTabController-root">
+          className="github-GitHub-root">
           {({itemHolder}) => (
             <GitHubTabItem
               ref={itemHolder.setter}
diff --git a/lib/github-package.js b/lib/github-package.js
@@ -342,7 +342,7 @@ export default class GithubPackage {
       this.gitTabStubItem = this.gitTabStubItem || item;
       break;
     case 'atom-github://dock-item/github':
-      item = this.createGithubTabControllerStub(uri);
+      item = this.createGitHubStub(uri);
       this.githubTabStubItem = this.githubTabStubItem || item;
       break;
     default:
@@ -361,8 +361,8 @@ export default class GithubPackage {
     }, uri);
   }
 
-  createGithubTabControllerStub(uri) {
-    return StubItem.create('github-tab-controller', {
+  createGitHubStub(uri) {
+    return StubItem.create('github', {
       title: 'GitHub (preview)',
     }, uri);
   }
diff --git a/lib/views/github-tab-view.js b/lib/views/github-tab-view.js
@@ -30,8 +30,8 @@ export default class GitHubTabView extends React.Component {
 
   render() {
     return (
-      <div className="github-GithubTabController" ref={this.props.rootHolder.setter}>
-        <div className="github-GithubTabController-content">
+      <div className="github-GitHub" ref={this.props.rootHolder.setter}>
+        <div className="github-GitHub-content">
           {this.renderRemote()}
         </div>
       </div>
@@ -73,7 +73,7 @@ export default class GitHubTabView extends React.Component {
     // No remotes available
     // TODO: display a view that lets you create a repository on GitHub
     return (
-      <div className="github-GithubTabController-no-remotes">
+      <div className="github-GitHub-noRemotes">
         This repository does not have any remotes hosted at GitHub.com.
       </div>
     );
diff --git a/styles/github-tab.less b/styles/github-tab.less
@@ -1,10 +1,10 @@
-.github-StubItem-github-tab-controller,
-.github-GithubTabController-root {
+.github-StubItem-github,
+.github-GitHub-root {
   flex: 1;
   display: flex;
 }
 
-.github-GithubTabController {
+.github-Github {
   flex: 1;
   min-width: 0;
   display: flex;
@@ -16,7 +16,7 @@
     flex-direction: column;
   }
 
-  &-no-remotes {
+  &-noRemotes {
     margin: 10px;
     font-size: @font-size * 1.25;
   }
diff --git a/test/controllers/github-tab-controller.test.js b/test/controllers/github-tab-controller.test.js
@@ -2,14 +2,14 @@ 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 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';
 
-describe('GithubTabController', function() {
+describe('GitHubTabController', function() {
   let atomEnv;
 
   beforeEach(function() {
@@ -26,7 +26,7 @@ describe('GithubTabController', function() {
       ...overrideProps,
     };
 
-    return <GithubTabController {...gitHubTabControllerProps(atomEnv, props.repository, props)} />;
+    return <GitHubTabController {...gitHubTabControllerProps(atomEnv, props.repository, props)} />;
   }
 
   describe('derived view props', function() {
diff --git a/test/items/github-tab-item.test.js b/test/items/github-tab-item.test.js
@@ -69,11 +69,11 @@ describe('GitHubTabItem', function() {
       documentActiveElement: () => activeElement,
     }));
     const item = await atomEnv.workspace.open(GitHubTabItem.buildURI());
-    await assert.async.isTrue(wrapper.update().find('.github-GithubTabController').exists());
+    await assert.async.isTrue(wrapper.update().find('.github-GitHub').exists());
 
     assert.isFalse(item.hasFocus());
 
-    activeElement = wrapper.find('.github-GithubTabController').getDOMNode();
+    activeElement = wrapper.find('.github-GitHub').getDOMNode();
     assert.isTrue(item.hasFocus());
   });
 });
diff --git a/test/views/github-tab-view.test.js b/test/views/github-tab-view.test.js
@@ -56,6 +56,6 @@ describe('GitHubTabView', function() {
 
   it('renders a static message when no remotes are available', function() {
     const wrapper = shallow(buildApp({currentRemote: nullRemote, manyRemotesAvailable: false}));
-    assert.isTrue(wrapper.find('.github-GithubTabController-no-remotes').exists());
+    assert.isTrue(wrapper.find('.github-GitHub-noRemotes').exists());
   });
 });
