diff --git a/keymaps/git.cson b/keymaps/git.cson deleted file mode 100644 index f2ba12b48..000000000 --- a/keymaps/git.cson +++ /dev/null @@ -1,155 +0,0 @@ -'.workspace': - 'ctrl-8': 'github:toggle-github-tab-focus' - 'ctrl-shift-8': 'github:toggle-github-tab' - 'ctrl-9': 'github:toggle-git-tab-focus' - 'ctrl-shift-9': 'github:toggle-git-tab' - 'alt-g enter': 'github:commit' - 'alt-g f': 'github:fetch' - 'alt-g shift-f': 'github:pull' - 'alt-g p': 'github:push' - 'alt-g shift-p': 'github:force-push' - 'alt-g =': 'github:clone' - 'alt-g r': 'github:open-reviews-tab' - -'atom-text-editor': - 'alt-m 1': 'github:resolve-as-ours' - 'alt-m 2': 'github:resolve-as-theirs' - 'alt-m 3': 'github:resolve-as-base' - 'alt-m enter': 'github:resolve-as-current' - 'alt-m r': 'github:revert-current' - -'.platform-darwin .github-Git': - 'cmd-enter': 'github:commit' -'.platform-win32 .github-Git, .platform-linux .github-Git': - 'ctrl-enter': 'github:commit' - -'.github-StagingView': - 'tab': 'core:focus-next' - 'shift-tab': 'core:focus-previous' - 'o': 'github:jump-to-file' - 'left': 'core:move-left' -'.platform-darwin .github-StagingView': - 'cmd-left': 'core:move-left' -'.platform-linux .github-StagingView, .platform-win32 .github-StagingView': - 'ctrl-left': 'core-move-left' - -'.github-CommitView button': - 'tab': 'core:focus-next' - 'shift-tab': 'core:focus-previous' - -'.platform-darwin .github-StagingView.unstaged-changes-focused': - 'cmd-backspace': 'github:discard-changes-in-selected-files' -'.platform-linux .github-StagingView.unstaged-changes-focused': - 'ctrl-backspace': 'github:discard-changes-in-selected-files' -'.platform-win32 .github-StagingView.unstaged-changes-focused': - # Repeated to avoid line length - 'ctrl-backspace': 'github:discard-changes-in-selected-files' - -'.github-CommitView-editor atom-text-editor:not([mini])': - 'tab': 'core:focus-next' - 'shift-tab': 'core:focus-previous' -'.platform-darwin .github-CommitView-editor atom-text-editor:not([mini])': - 'cmd-enter': 'github:commit' -'.platform-win32 .github-CommitView-editor atom-text-editor:not([mini])': - 'ctrl-enter': 'github:commit' -'.platform-linux .github-CommitView-editor atom-text-editor:not([mini])': - # Repeated to avoid line length - 'ctrl-enter': 'github:commit' - -'.github-CommitView-commitPreview': - 'left': 'github-dive' - 'enter': 'native!' -'.platform-darwin .github-CommitView-commitPreview': - 'cmd-left': 'github:dive' -'.platform-win32 .github-CommitView-commitPreview': - 'ctrl-left': 'github:dive' -'.platform-linux .github-CommitView-commitPreview': - 'ctrl-left': 'github:dive' - -'.github-RecentCommits': - 'left': 'github:dive' - 'enter': 'github:dive' - 'tab': 'core:focus-next' - 'shift-tab': 'core:focus-previous' -'.platform-darwin .github-RecentCommits': - 'cmd-left': 'github:dive' -'.platform-win32 .github-RecentCommits, .platform-linux .github-RecentCommits': - 'ctrl-left': 'github:dive' - -'.github-FilePatchView atom-text-editor:not([mini])': - # Only support unprefixed file patch keybindings until MultiFilePatch is - # editable - '/': 'github:toggle-patch-selection-mode' - 'backspace': 'github:discard-selected-lines' - 'enter': 'core:confirm' - 'right': 'github:surface' - 'o': 'github:jump-to-file' -'.platform-darwin .github-FilePatchView atom-text-editor:not([mini])': - 'cmd-/': 'github:toggle-patch-selection-mode' - 'cmd-backspace': 'github:discard-selected-lines' - 'cmd-enter': 'core:confirm' - 'cmd-right': 'github:surface' - 'cmd-o': 'github:jump-to-file' -'.platform-win32 .github-FilePatchView atom-text-editor:not([mini])': - 'ctrl-/': 'github:toggle-patch-selection-mode' - 'ctrl-backspace': 'github:discard-selected-lines' - 'ctrl-enter': 'core:confirm' - 'ctrl-right': 'github:surface' - 'ctrl-o': 'github:jump-to-file' -'.platform-linux .github-FilePatchView atom-text-editor:not([mini])': - 'ctrl-/': 'github:toggle-patch-selection-mode' - 'ctrl-backspace': 'github:discard-selected-lines' - 'ctrl-enter': 'core:confirm' - 'ctrl-right': 'github:surface' - 'ctrl-o': 'github:jump-to-file' - -'.github-FilePatchView--hunkMode atom-text-editor:not([mini])': - 'down': 'github:select-next-hunk' - 'up': 'github:select-previous-hunk' - -'.github-Prompt-input': - 'enter': 'core:confirm' - 'esc': 'tool-panel:unfocus' - -'.github-Dialog': - 'tab': 'core:focus-next' - 'shift-tab': 'core:focus-previous' - -'.github-Dialog input': - 'enter': 'core:confirm' - -'.github-CoAuthorForm input': - 'enter': 'core:confirm' - -'body .github-TabbableWrapper': - 'down': 'github:selectbox-down' - 'up': 'github:selectbox-up' - 'enter': 'github:selectbox-enter' - 'tab': 'github:selectbox-tab' - 'backspace': 'github:selectbox-backspace' - 'pageup': 'github:selectbox-pageup' - 'pagedown': 'github:selectbox-pagedown' - 'end': 'github:selectbox-end' - 'home': 'github:selectbox-home' - 'delete': 'github:selectbox-delete' - 'escape': 'github:selectbox-escape' - -'body .github-CommitView-coAuthorEditor': - 'shift-backspace': 'github:co-author-exclude' - -'.platform-darwin .github-Reviews': - 'cmd-=': 'github:more-context' - 'cmd--': 'github:less-context' -'.platform-win32 .github-Reviews': - 'ctrl-=': 'github:more-context' - 'ctrl--': 'github:less-context' -'.platform-linux .github-Reviews': - 'ctrl-=': 'github:more-context' - 'ctrl--': 'github:less-context' - -'.platform-darwin .github-Reviews atom-text-editor': - 'cmd-enter': 'github:submit-comment' -'.platform-win32 .github-Reviews atom-text-editor': - 'ctrl-enter': 'github:submit-comment' -'.platform-linux .github-Reviews atom-text-editor': - 'ctrl-enter': 'github:submit-comment' diff --git a/keymaps/git.json b/keymaps/git.json new file mode 100644 index 000000000..42aeaa170 --- /dev/null +++ b/keymaps/git.json @@ -0,0 +1,174 @@ +{ + ".workspace": { + "ctrl-8": "github:toggle-github-tab-focus", + "ctrl-shift-8": "github:toggle-github-tab", + "ctrl-9": "github:toggle-git-tab-focus", + "ctrl-shift-9": "github:toggle-git-tab", + "alt-g enter": "github:commit", + "alt-g f": "github:fetch", + "alt-g shift-f": "github:pull", + "alt-g p": "github:push", + "alt-g shift-p": "github:force-push", + "alt-g =": "github:clone", + "alt-g r": "github:open-reviews-tab" + }, + "atom-text-editor": { + "alt-m 1": "github:resolve-as-ours", + "alt-m 2": "github:resolve-as-theirs", + "alt-m 3": "github:resolve-as-base", + "alt-m enter": "github:resolve-as-current", + "alt-m r": "github:revert-current" + }, + ".platform-darwin .github-Git": { + "cmd-enter": "github:commit" + }, + ".platform-win32 .github-Git, .platform-linux .github-Git": { + "ctrl-enter": "github:commit" + }, + ".github-StagingView": { + "tab": "core:focus-next", + "shift-tab": "core:focus-previous", + "o": "github:jump-to-file", + "left": "core:move-left" + }, + ".platform-darwin .github-StagingView": { + "cmd-left": "core:move-left" + }, + ".platform-linux .github-StagingView, .platform-win32 .github-StagingView": { + "ctrl-left": "core-move-left" + }, + ".github-CommitView button": { + "tab": "core:focus-next", + "shift-tab": "core:focus-previous" + }, + ".platform-darwin .github-StagingView.unstaged-changes-focused": { + "cmd-backspace": "github:discard-changes-in-selected-files" + }, + ".platform-linux .github-StagingView.unstaged-changes-focused": { + "ctrl-backspace": "github:discard-changes-in-selected-files" + }, + ".platform-win32 .github-StagingView.unstaged-changes-focused": { + "ctrl-backspace": "github:discard-changes-in-selected-files" + }, + ".github-CommitView-editor atom-text-editor:not([mini])": { + "tab": "core:focus-next", + "shift-tab": "core:focus-previous" + }, + ".platform-darwin .github-CommitView-editor atom-text-editor:not([mini])": { + "cmd-enter": "github:commit" + }, + ".platform-win32 .github-CommitView-editor atom-text-editor:not([mini])": { + "ctrl-enter": "github:commit" + }, + ".platform-linux .github-CommitView-editor atom-text-editor:not([mini])": { + "ctrl-enter": "github:commit" + }, + ".github-CommitView-commitPreview": { + "left": "github-dive", + "enter": "native!" + }, + ".platform-darwin .github-CommitView-commitPreview": { + "cmd-left": "github:dive" + }, + ".platform-win32 .github-CommitView-commitPreview": { + "ctrl-left": "github:dive" + }, + ".platform-linux .github-CommitView-commitPreview": { + "ctrl-left": "github:dive" + }, + ".github-RecentCommits": { + "left": "github:dive", + "enter": "github:dive", + "tab": "core:focus-next", + "shift-tab": "core:focus-previous" + }, + ".platform-darwin .github-RecentCommits": { + "cmd-left": "github:dive" + }, + ".platform-win32 .github-RecentCommits, .platform-linux .github-RecentCommits": { + "ctrl-left": "github:dive" + }, + ".github-FilePatchView atom-text-editor:not([mini])": { + "/": "github:toggle-patch-selection-mode", + "backspace": "github:discard-selected-lines", + "enter": "core:confirm", + "right": "github:surface", + "o": "github:jump-to-file" + }, + ".platform-darwin .github-FilePatchView atom-text-editor:not([mini])": { + "cmd-/": "github:toggle-patch-selection-mode", + "cmd-backspace": "github:discard-selected-lines", + "cmd-enter": "core:confirm", + "cmd-right": "github:surface", + "cmd-o": "github:jump-to-file" + }, + ".platform-win32 .github-FilePatchView atom-text-editor:not([mini])": { + "ctrl-/": "github:toggle-patch-selection-mode", + "ctrl-backspace": "github:discard-selected-lines", + "ctrl-enter": "core:confirm", + "ctrl-right": "github:surface", + "ctrl-o": "github:jump-to-file" + }, + ".platform-linux .github-FilePatchView atom-text-editor:not([mini])": { + "ctrl-/": "github:toggle-patch-selection-mode", + "ctrl-backspace": "github:discard-selected-lines", + "ctrl-enter": "core:confirm", + "ctrl-right": "github:surface", + "ctrl-o": "github:jump-to-file" + }, + ".github-FilePatchView--hunkMode atom-text-editor:not([mini])": { + "down": "github:select-next-hunk", + "up": "github:select-previous-hunk" + }, + ".github-Prompt-input": { + "enter": "core:confirm", + "esc": "tool-panel:unfocus" + }, + ".github-Dialog": { + "tab": "core:focus-next", + "shift-tab": "core:focus-previous" + }, + ".github-Dialog input": { + "enter": "core:confirm" + }, + ".github-CoAuthorForm input": { + "enter": "core:confirm" + }, + "body .github-TabbableWrapper": { + "down": "github:selectbox-down", + "up": "github:selectbox-up", + "enter": "github:selectbox-enter", + "tab": "github:selectbox-tab", + "backspace": "github:selectbox-backspace", + "pageup": "github:selectbox-pageup", + "pagedown": "github:selectbox-pagedown", + "end": "github:selectbox-end", + "home": "github:selectbox-home", + "delete": "github:selectbox-delete", + "escape": "github:selectbox-escape" + }, + "body .github-CommitView-coAuthorEditor": { + "shift-backspace": "github:co-author-exclude" + }, + ".platform-darwin .github-Reviews": { + "cmd-=": "github:more-context", + "cmd--": "github:less-context" + }, + ".platform-win32 .github-Reviews": { + "ctrl-=": "github:more-context", + "ctrl--": "github:less-context" + }, + ".platform-linux .github-Reviews": { + "ctrl-=": "github:more-context", + "ctrl--": "github:less-context" + }, + ".platform-darwin .github-Reviews atom-text-editor": { + "cmd-enter": "github:submit-comment" + }, + ".platform-win32 .github-Reviews atom-text-editor": { + "ctrl-enter": "github:submit-comment" + }, + ".platform-linux .github-Reviews atom-text-editor": { + "ctrl-enter": "github:submit-comment" + } +} diff --git a/lib/github-package.js b/lib/github-package.js index 99aa8fb59..6dc2c10c3 100644 --- a/lib/github-package.js +++ b/lib/github-package.js @@ -55,7 +55,7 @@ export default class GithubPackage { this.styles = styles; this.grammars = grammars; this.keymaps = keymaps; - this.configPath = path.join(configDirPath, 'github.cson'); + this.configPath = path.join(configDirPath, 'github.json'); this.currentWindow = currentWindow; this.styleCalculator = new StyleCalculator(this.styles, this.config); diff --git a/menus/git.cson b/menus/git.cson deleted file mode 100644 index 6bccd6ee6..000000000 --- a/menus/git.cson +++ /dev/null @@ -1,152 +0,0 @@ -'menu': [ - { - 'label': 'View' - 'submenu': [ - { - 'label': 'Toggle Git Tab' - 'command': 'github:toggle-git-tab' - } - { - 'label': 'Toggle GitHub Tab' - 'command': 'github:toggle-github-tab' - } - { - 'label': 'Open Reviews Tab' - 'command': 'github:open-reviews-tab' - } - ] - } - { - 'label': 'Packages' - 'submenu': [ - { - 'label': 'GitHub', - 'submenu': [ - { - 'label': 'Toggle Git Tab' - 'command': 'github:toggle-git-tab' - } - { - 'label': 'Toggle GitHub Tab' - 'command': 'github:toggle-github-tab' - } - { - 'label': 'Open Reviews Tab' - 'command': 'github:open-reviews-tab' - } - ] - } - ] - } -] -'context-menu': - '.github-FilePatchListView-item': [ - { - 'label': 'Jump to File' - 'command': 'github:jump-to-file' - } - ] - '.github-FilePatchView--staged': [ - { - 'type': 'separator' - } - { - 'label': 'Jump to File' - 'command': 'github:jump-to-file' - 'after': ['core:confirm'] - } - { - 'label': 'Unstage Selection' - 'command': 'core:confirm' - 'beforeGroupContaining': ['core:undo'] - } - ] - '.github-FilePatchView--unstaged': [ - { - 'type': 'separator' - } - { - 'label': 'Jump to File' - 'command': 'github:jump-to-file' - 'after': ['core:confirm'] - } - { - 'label': 'Stage Selection' - 'command': 'core:confirm' - 'beforeGroupContaining': ['core:undo'] - } - { - 'label': 'Discard Selection' - 'command': 'github:discard-selected-lines' - } - ] - '.github-DotComMarkdownHtml .issue-link': [ - { - 'label': 'Open in New Tab' - 'command': 'github:open-link-in-new-tab' - } - { - 'label': 'Open in This Tab' - 'command': 'github:open-link-in-this-tab' - } - { - 'label': 'Open in Browser' - 'command': 'github:open-link-in-browser' - } - ] - '.github-CommitView': [ - { - 'type': 'separator' - } - { - 'label': 'Toggle Expanded Commit Message Editor' - 'command': 'github:toggle-expanded-commit-message-editor' - } - ] - '.item-views > atom-text-editor': [ - { - 'label': 'View Unstaged Changes', - 'command': 'github:view-unstaged-changes-for-current-file' - } - { - 'label': 'View Staged Changes', - 'command': 'github:view-staged-changes-for-current-file' - } - ] - '.github-PushPull': [ - { - 'label': 'Fetch', - 'command': 'github:fetch' - } - { - 'label': 'Pull', - 'command': 'github:pull' - } - { - 'type': 'separator' - } - { - 'label': 'Push', - 'command': 'github:push' - } - { - 'label': 'Force Push', - 'command': 'github:force-push' - } - ] - '.most-recent': [ - { - 'label': 'Amend' - 'command': 'github:amend-last-commit' - } - ] - '.github-RecentCommit': [ - { - 'label': 'Copy Commit SHA' - 'command': 'github:copy-commit-sha' - } - { - 'label': 'Copy Commit Subject' - 'command': 'github:copy-commit-subject' - } - ] diff --git a/menus/git.json b/menus/git.json new file mode 100644 index 000000000..8563abff9 --- /dev/null +++ b/menus/git.json @@ -0,0 +1,163 @@ +{ + "menu": [ + { + "label": "View", + "submenu": [ + { + "label": "Toggle Git Tab", + "command": "github:toggle-git-tab" + }, + { + "label": "Toggle GitHub Tab", + "command": "github:toggle-github-tab" + }, + { + "label": "Open Reviews Tab", + "command": "github:open-reviews-tab" + } + ] + }, + { + "label": "Packages", + "submenu": [ + { + "label": "GitHub", + "submenu": [ + { + "label": "Toggle Git Tab", + "command": "github:toggle-git-tab" + }, + { + "label": "Toggle GitHub Tab", + "command": "github:toggle-github-tab" + }, + { + "label": "Open Reviews Tab", + "command": "github:open-reviews-tab" + } + ] + } + ] + } + ], + "context-menu": { + ".github-FilePatchListView-item": [ + { + "label": "Jump to File", + "command": "github:jump-to-file" + } + ], + ".github-FilePatchView--staged": [ + { + "type": "separator" + }, + { + "label": "Jump to File", + "command": "github:jump-to-file", + "after": [ + "core:confirm" + ] + }, + { + "label": "Unstage Selection", + "command": "core:confirm", + "beforeGroupContaining": [ + "core:undo" + ] + } + ], + ".github-FilePatchView--unstaged": [ + { + "type": "separator" + }, + { + "label": "Jump to File", + "command": "github:jump-to-file", + "after": [ + "core:confirm" + ] + }, + { + "label": "Stage Selection", + "command": "core:confirm", + "beforeGroupContaining": [ + "core:undo" + ] + }, + { + "label": "Discard Selection", + "command": "github:discard-selected-lines" + } + ], + ".github-DotComMarkdownHtml .issue-link": [ + { + "label": "Open in New Tab", + "command": "github:open-link-in-new-tab" + }, + { + "label": "Open in This Tab", + "command": "github:open-link-in-this-tab" + }, + { + "label": "Open in Browser", + "command": "github:open-link-in-browser" + } + ], + ".github-CommitView": [ + { + "type": "separator" + }, + { + "label": "Toggle Expanded Commit Message Editor", + "command": "github:toggle-expanded-commit-message-editor" + } + ], + ".item-views > atom-text-editor": [ + { + "label": "View Unstaged Changes", + "command": "github:view-unstaged-changes-for-current-file" + }, + { + "label": "View Staged Changes", + "command": "github:view-staged-changes-for-current-file" + } + ], + ".github-PushPull": [ + { + "label": "Fetch", + "command": "github:fetch" + }, + { + "label": "Pull", + "command": "github:pull" + }, + { + "type": "separator" + }, + { + "label": "Push", + "command": "github:push" + }, + { + "label": "Force Push", + "command": "github:force-push" + } + ], + ".most-recent": [ + { + "label": "Amend", + "command": "github:amend-last-commit" + } + ], + ".github-RecentCommit": [ + { + "label": "Copy Commit SHA", + "command": "github:copy-commit-sha" + }, + { + "label": "Copy Commit Subject", + "command": "github:copy-commit-subject" + } + ] + } +} diff --git a/test/github-package.test.js b/test/github-package.test.js index dc1e07b41..fbfd330e0 100644 --- a/test/github-package.test.js +++ b/test/github-package.test.js @@ -263,7 +263,7 @@ describe('GithubPackage', function() { describe('with showOnStartup and no config file', function() { let confFile; beforeEach(async function() { - confFile = path.join(configDirPath, 'github.cson'); + confFile = path.join(configDirPath, 'github.json'); await fs.remove(confFile); config.set('welcome.showOnStartup', true); @@ -286,7 +286,7 @@ describe('GithubPackage', function() { describe('without showOnStartup and no config file', function() { let confFile; beforeEach(async function() { - confFile = path.join(configDirPath, 'github.cson'); + confFile = path.join(configDirPath, 'github.json'); await fs.remove(confFile); config.set('welcome.showOnStartup', false); @@ -309,7 +309,7 @@ describe('GithubPackage', function() { describe('when it\'s not the first run for new projects', function() { let confFile; beforeEach(async function() { - confFile = path.join(configDirPath, 'github.cson'); + confFile = path.join(configDirPath, 'github.json'); await fs.writeFile(confFile, '', {encoding: 'utf8'}); await githubPackage.activate(); }); @@ -330,7 +330,7 @@ describe('GithubPackage', function() { describe('when it\'s not the first run for existing projects', function() { let confFile; beforeEach(async function() { - confFile = path.join(configDirPath, 'github.cson'); + confFile = path.join(configDirPath, 'github.json'); await fs.writeFile(confFile, '', {encoding: 'utf8'}); await githubPackage.activate({newProject: false}); }); diff --git a/test/integration/launch.test.js b/test/integration/launch.test.js index 47f22a2e7..2b1740547 100644 --- a/test/integration/launch.test.js +++ b/test/integration/launch.test.js @@ -14,7 +14,7 @@ describe('integration: package initialization', function() { it('reveals the tabs on first run when the welcome package has been dismissed', async function() { context = await setup({ - initConfigDir: configDirPath => fs.remove(path.join(configDirPath, 'github.cson')), + initConfigDir: configDirPath => fs.remove(path.join(configDirPath, 'github.json')), initAtomEnv: env => env.config.set('welcome.showOnStartup', false), }); @@ -29,7 +29,7 @@ describe('integration: package initialization', function() { it('renders but does not reveal the tabs on first run when the welcome package has not been dismissed', async function() { context = await setup({ - initConfigDir: configDirPath => fs.remove(path.join(configDirPath, 'github.cson')), + initConfigDir: configDirPath => fs.remove(path.join(configDirPath, 'github.json')), initAtomEnv: env => env.config.set('welcome.showOnStartup', true), }); @@ -44,7 +44,7 @@ describe('integration: package initialization', function() { it('renders but does not reveal the tabs on new projects after the first run', async function() { context = await setup({ - initConfigDir: configDirPath => fs.writeFile(path.join(configDirPath, 'github.cson'), '#', {encoding: 'utf8'}), + initConfigDir: configDirPath => fs.writeFile(path.join(configDirPath, 'github.json'), '#', {encoding: 'utf8'}), state: {}, }); @@ -59,7 +59,7 @@ describe('integration: package initialization', function() { it('respects serialized state on existing projects after the first run', async function() { const nonFirstRun = { - initConfigDir: configDirPath => fs.writeFile(path.join(configDirPath, 'github.cson'), '#', {encoding: 'utf8'}), + initConfigDir: configDirPath => fs.writeFile(path.join(configDirPath, 'github.json'), '#', {encoding: 'utf8'}), state: {newProject: false}, }; @@ -89,7 +89,7 @@ describe('integration: package initialization', function() { const getPaneItemURIs = ctx => ctx.atomEnv.workspace.getPaneItems().map(i => i.getURI()); const prevContext = await setup({ - initConfigDir: configDirPath => fs.writeFile(path.join(configDirPath, 'github.cson'), '#', {encoding: 'utf8'}), + initConfigDir: configDirPath => fs.writeFile(path.join(configDirPath, 'github.json'), '#', {encoding: 'utf8'}), state: {firstRun: true}, }); @@ -107,7 +107,7 @@ describe('integration: package initialization', function() { await teardown(prevContext); context = await setup({ - initConfigDir: configDirPath => fs.writeFile(path.join(configDirPath, 'github.cson'), '#', {encoding: 'utf8'}), + initConfigDir: configDirPath => fs.writeFile(path.join(configDirPath, 'github.json'), '#', {encoding: 'utf8'}), state: {firstRun: false}, }); await context.atomEnv.deserialize(prevState); diff --git a/test/integration/open.test.js b/test/integration/open.test.js index e2e9e4e70..493c827a1 100644 --- a/test/integration/open.test.js +++ b/test/integration/open.test.js @@ -9,7 +9,7 @@ describe('integration: opening and closing tabs', function() { beforeEach(async function() { context = await setup({ initialRoots: ['three-files'], - initConfigDir: configDirPath => fs.writeFile(path.join(configDirPath, 'github.cson'), ''), + initConfigDir: configDirPath => fs.writeFile(path.join(configDirPath, 'github.json'), ''), state: {newProject: false}, });