Merge remote-tracking branch 'origin/master'

# Conflicts: # .github/workflows/integration-lint-release.yml
UAlbertaALTLab · Nov 18, 2020 · 81a8a8e · 81a8a8e
2 parents f29408d + 28f1676
commit 81a8a8e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/integration-lint-release.yml b/.github/workflows/integration-lint-release.yml
@@ -69,6 +69,7 @@ jobs:
           #   nothing is put at stake by publishing some extra packages either.
           draft: false
           prerelease: false
+
       - name: Upload Release Asset
         if: github.event_name == 'push'
         uses: actions/upload-release-asset@v1

diff --git a/cypress/integration/copy_translation_to_clipboard.js b/cypress/integration/copy_translation_to_clipboard.js
@@ -1,6 +1,6 @@
 // copy button doesn't work
-describe('Clipboard', function() {
-  it.skip('copies the last translation to clipboard', function() {
+describe.skip('Clipboard', function() {
+  it('copies the last translation to clipboard', function() {
     cy.visit('localhost:8080/test.html')
 
 

diff --git a/lib/transover_core.js b/lib/transover_core.js
@@ -79,7 +79,7 @@ Core.parseAPIResponse = (data, word, sendResponse) => {
 
       const definition_list = []
 
-      result.definitions.forEach(function (definition) {
+      result.lemma_wordform.definitions.forEach(function (definition) {
         definition_list.push(definition.text + '; ' + definition.source_ids.join(' '))
       }
       )

diff --git a/libexec/integration-test.js b/libexec/integration-test.js
@@ -10,7 +10,7 @@ const waitOnProcess = spawn('npx', ['wait-on', 'http-get://localhost:8080/test.h
 waitOnProcess.on('close', () => {
   console.log('starting cypress tests')
 
-  const cypressProcess = spawn('npx', ['cypress', 'run', '--spec', 'cypress/integration/*'], {shell:true})
+  const cypressProcess = spawn('npx', ['cypress', 'run'], {shell:true})
   // fixme: we can maybe add stdio option to replace the two lines below
   //  see https://nodejs.org/api/child_process.html#child_process_options_stdio
   //  However, I tried stdio:'pipe', stdio: ['pipe', 'pipe', 'pipe'], and stdio: ['ignore', 'pipe', 'pipe']