Fix(tests): renamed repo broke tests.

Also added a test for our regexp parser.
mntnr · Nov 2, 2017 · b59a656 · b59a656
1 parent d924d75
commit b59a656
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 20 deletions.
diff --git a/src/cli.js b/src/cli.js
@@ -60,7 +60,6 @@ const handleOut = console.log
 
 const handleError = e => {
   console.error(e.stack)
-
 }
 
 const callWithDefaults = (f, opts) => {

diff --git a/src/graphql.js b/src/graphql.js
@@ -1,7 +1,6 @@
 'use strict'
 
 const https = require('https')
-const fs = require('fs')
 
 /** Escape strings to prevent injection attacks. Other types aren't an issue. */
 const escapeArgValue = val => {

diff --git a/src/index.js b/src/index.js
@@ -21,17 +21,19 @@ const shellOut = command =>
 
 const gitConfigCommand = 'git config --get remote.origin.url'
 
-const parseGitURL = new RegExp('.*github\\.com[:/]([^/]+)\\/(.+)$')
+const parseGitURLRE = new RegExp('.*github\\.com[:/]([^/]+)\\/(.+)$')
+
+const parseGitURL = url => {
+  const parse = parseGitURLRE.exec(url.trim())
+  if (parse[2].endsWith('.git')) {
+    parse[2] = parse[2].substr(0, parse[2].length - 4)
+  }
+  return parse
+}
 
 const getCurrentRepoInfo = () => shellOut(gitConfigCommand)
-      .then(x => parseGitURL.exec(x.trim()))
-      .then(x => {
-        let repo = x[2]
-        if (repo.endsWith('.git')) {
-          repo = repo.substr(0, repo.length - 4)
-        }
-        return {user: x[1], repo}
-      })
+      .then(parseGitURL)
+      .then(x => {return {user: x[1], repo: x[2]}})
 
 //
 // CSV Output
@@ -115,6 +117,7 @@ const currentUser = token =>
 
 module.exports = {
   toCSV,
+  parseGitURL,
   getCurrentRepoInfo,
   currentUser,
   repoContributors,

diff --git a/test/integration-test.js b/test/integration-test.js
@@ -35,7 +35,7 @@ const contribPre = {
 test('No contributions in a single second', t => {
   return main.repoContributors({
     token: token,
-    user: 'RichardLitt',
+    user: 'mntnr',
     repo: 'name-your-contributors',
     after: new Date('2016-01-01T15:21:08.104Z'),
     before: new Date('2016-01-02T15:21:08.104Z')
@@ -63,7 +63,7 @@ const compareKeys = (x, k) =>
 test('Contributors before a fixed date remain static', t => {
   return main.repoContributors({
     token: token,
-    user: 'RichardLitt',
+    user: 'mntnr',
     repo: 'name-your-contributors',
     before: new Date('2017-09-21'),
     after: new Date(0)
@@ -77,17 +77,26 @@ test('Contributors before a fixed date remain static', t => {
 
 test('Queries without tokens get rejected', t => {
   return main.repoContributors({
-    user: 'RichardLitt',
+    user: 'mntnr',
     repo: 'name-your-contributors',
     before: new Date(),
     after: new Date(0)
   }).catch(error => t.is(error.message, 'Unauthorized'))
 })
 
-test('user repo names come back', async t => {
-  const repos = await main.userRepoNames({token, login: 'tgetgood'})
-
-  console.log(repos)
-
-  t.pass()
+test('All sorts of valid GitHub URLS', async t => {
+  /* eslint-disable */
+  // Need to test tabs...
+  const urls = [
+    'git@github.com:RichardLitt/name-your-contributors.git',
+    'git@github.com:RichardLitt/name-your-contributors\n',
+    '	https://github.com/RichardLitt/name-your-contributors ',
+    'https://github.com/RichardLitt/name-your-contributors	'
+  ]
+  /* eslint-enable */
+  for (let x of urls) {
+    let parse = main.parseGitURL(x)
+    t.is(parse[1], 'RichardLitt')
+    t.is(parse[2], 'name-your-contributors')
+  }
 })