Fix blob reader (OctoLinker#1427)

* Ensure unit tests use latest fixtures * Update fixture files * Adjust blob reader to dom changes made by github
yoyosource · Dec 30, 2021 · 80ed30d · 80ed30d
1 parent 772e11b
commit 80ed30d
Show file tree

Hide file tree

Showing 9 changed files with 7,492 additions and 4,181 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,6 +16,7 @@ jobs:
         node-version: 16
         cache: 'yarn'
     - run: yarn install
+    - run: ./packages/blob-reader/scripts/update-fixtures.sh
     - run: yarn test
     - run: yarn build
     - name: Run E2E

diff --git a/packages/blob-reader/fixtures/github.com/blob/89f13651df126efdb4f1e3ae40183c9fdccdb4d3.html b/packages/blob-reader/fixtures/github.com/blob/89f13651df126efdb4f1e3ae40183c9fdccdb4d3.html
diff --git a/...lob-reader/fixtures/github.com/commit/b0775a93ea27ee381858ddd9fa2bb953d5b74acb_split.html b/...lob-reader/fixtures/github.com/commit/b0775a93ea27ee381858ddd9fa2bb953d5b74acb_split.html
diff --git a/...b-reader/fixtures/github.com/commit/b0775a93ea27ee381858ddd9fa2bb953d5b74acb_unified.html b/...b-reader/fixtures/github.com/commit/b0775a93ea27ee381858ddd9fa2bb953d5b74acb_unified.html
diff --git a/packages/blob-reader/fixtures/github.com/gist/cbc01d87dca84a6e0b118b73a2d49927.html b/packages/blob-reader/fixtures/github.com/gist/cbc01d87dca84a6e0b118b73a2d49927.html
diff --git a/packages/blob-reader/fixtures/github.com/issue/code.html b/packages/blob-reader/fixtures/github.com/issue/code.html
diff --git a/packages/blob-reader/fixtures/github.com/pull/comments.html b/packages/blob-reader/fixtures/github.com/pull/comments.html
diff --git a/packages/blob-reader/fixtures/github.com/pull/diff.html b/packages/blob-reader/fixtures/github.com/pull/diff.html
diff --git a/packages/blob-reader/helper.js b/packages/blob-reader/helper.js
@@ -74,34 +74,19 @@ function getPath(el) {
   }
 
   // When current page is a gist, get path from blob name
-  if (!ret && isGist()) {
+  if (isGist()) {
     ret = $('.gist-blob-name', el.parentElement).text().trim();
     if (ret && !ret.startsWith('/')) {
       ret = `/${ret}`;
     }
   }
 
   // when page has pull request comment(s)
-  const $fileHeader = $('.file-header', el.parentElement);
+  const $fileHeader = $('summary', el.parentElement.parentElement);
   if (!ret && $fileHeader.length) {
-    let repoPath = '';
-    let filePath = '';
-
-    if ($('a.file-action', $fileHeader).length) {
-      // comment is outdated
-
-      filePath = $('.file-info', $fileHeader).text();
-      repoPath = $('a.file-action', $fileHeader).attr('href');
-    } else {
-      // comment is up-to-date
-
-      filePath = $('a', $fileHeader).text();
-      repoPath = $('a', $fileHeader).attr('href');
-    }
-
-    if (repoPath && filePath) {
-      ret = mergeRepoAndFilePath(repoPath, filePath);
-    }
+    const filePath = $('a', $fileHeader).text();
+    const repoPath = $('a', $fileHeader).attr('href');
+    ret = mergeRepoAndFilePath(repoPath, filePath);
   }
 
   return ret ? ret.trim() : undefined;
@@ -137,7 +122,7 @@ function diffMetaInformation(el) {
   const td = $(el).closest('td').get(0);
 
   // Blob view
-  if (td.classList.contains('js-file-line')) {
+  if (td.id.startsWith('LC') || isGist()) {
     return {};
   }