configuration.js loading flow

A bit more coherent and "dry"
Also add more tests to be sure to keep config.source coherent and avoid
mismatches

Author: LeoColomb

lib/configuration.js

@@ -5,10 +5,8 @@ const url = require('./util/github-url')
 module.exports = class Configuration {
   static load (context, path, source) {
     const options = context.repo(url(path, source))
-    return context.github.repos.getContent(options).then(res => {
-      const config = new Configuration(context, options)
-      return config.parse(Buffer.from(res.data.content, 'base64').toString())
-    })
+    const config = new Configuration(context, options)
+    return config.contents().then(buffer => config.parse(buffer))
   }
 
   constructor (context, source) {
@@ -37,15 +35,15 @@ module.exports = class Configuration {
         return load.then(config => config.execute(this.context))
       }
     })
-
-    return undefined
   }
 
   contents (path) {
-    const options = this.context.repo(url(path, this.source))
-    return this.context.github.repos.getContent(options).then(res => {
-      return Buffer.from(res.data.content, 'base64').toString()
-    })
+    const options = path
+      ? this.context.repo(url(path, this.source))
+      : this.source
+    return this.context.github.repos.getContent(options).then(res =>
+      Buffer.from(res.data.content, 'base64').toString()
+    )
   }
 
   parse (content) {

test/index.js

@@ -114,13 +114,28 @@ describe('app', () => {
         if (params.path === 'script-b.js') {
           return ''
         }
-        return 'include("other/repo:script-a.js");'
+        return `
+          include("other/repo:script-a.js");
+          include("another/repo:script-a.js");
+          include("script-b.js");
+        `
       })
+      expect(github.repos.getContent).toHaveBeenCalledTimes(1 + 3 + 2)
       expect(github.repos.getContent).toHaveBeenCalledWith({
         owner: 'other',
         repo: 'repo',
         path: 'script-b.js'
       })
+      expect(github.repos.getContent).toHaveBeenCalledWith({
+        owner: 'another',
+        repo: 'repo',
+        path: 'script-b.js'
+      })
+      expect(github.repos.getContent).toHaveBeenCalledWith({
+        owner: 'bkeepers-inc',
+        repo: 'test',
+        path: 'script-b.js'
+      })
     })
   })
 
@@ -156,5 +171,28 @@ describe('app', () => {
         path: 'content.md'
       })
     })
+
+    it('gets contents relative to included repository', async () => {
+      await configure(params => {
+        if (params.path === 'content.md' || params.path === 'label.md') {
+          return ''
+        }
+        return `
+          on("issues")
+            .comment(contents("other/repo:content.md"))
+            .comment(contents("label.md"));
+        `
+      })
+      expect(github.repos.getContent).toHaveBeenCalledWith({
+        owner: 'other',
+        repo: 'repo',
+        path: 'content.md'
+      })
+      expect(github.repos.getContent).toHaveBeenCalledWith({
+        owner: 'bkeepers-inc',
+        repo: 'test',
+        path: 'label.md'
+      })
+    })
   })
 })