Skip to content
This repository has been archived by the owner on Apr 26, 2019. It is now read-only.

Fixed for Hapi 17+ #23

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed for Hapi 17+ #23

wants to merge 1 commit into from

Conversation

bloodf
Copy link

@bloodf bloodf commented Jan 30, 2019

No description provided.

@ci-reporter
Copy link

ci-reporter bot commented Jan 30, 2019

The build is failing

✨ Good work on this PR so far! ✨ Unfortunately, the Travis CI build is failing as of e960ab1. Here's the output:

npm test
> hapi-cors-headers@ pretest /home/travis/build/gr2m/hapi-cors-headers
> standard


> hapi-cors-headers@ test /home/travis/build/gr2m/hapi-cors-headers
> tap --100 --coverage tests

tests/index.js ...................................... 14/18
  request.headers.origin is undefined
  not ok reply.continue called
    +++ found                                                           
    --- wanted                                                          
    -true                                                               
    +false                                                              
    compare: ===
    at:
      line: 1
      column: 5409
      file: tests/index.js
      type: Test
    stack: >
      Test.<anonymous> (tests/index.js:1:5409)
    
      Object.<anonymous> (tests/index.js:1:4954)
    
      Object.<anonymous> (node_modules/esm/esm.js:1:227183)
    
      node_modules/esm/esm.js:1:222656
    
      Generator.next (<anonymous>)
    
      cu (node_modules/esm/esm.js:1:223009)
    
      yu (node_modules/esm/esm.js:1:225201)
    
      p (node_modules/esm/esm.js:1:261393)
    
      node_modules/esm/esm.js:1:260750
    
      node_modules/esm/esm.js:1:258671
    
      Object.apply (node_modules/esm/esm.js:1:182783)
    
      Object.<anonymous>
      (node_modules/nyc/node_modules/append-transform/index.js:62:4)
    
      node_modules/esm/esm.js:1:211446
    
      node_modules/esm/esm.js:1:211481
    
      node_modules/esm/esm.js:1:211686
    
      yl (node_modules/esm/esm.js:1:209574)
    
      wl (node_modules/esm/esm.js:1:210888)
    
      gc (node_modules/esm/esm.js:1:233442)
    
      Proxy.<anonymous> (node_modules/esm/esm.js:1:268669)
    
      Proxy.<anonymous> (node_modules/esm/esm.js:1:268478)
    
      Proxy.<anonymous> (node_modules/esm/esm.js:1:258671)
    
      Object.apply (node_modules/esm/esm.js:1:182783)
    
      Object.<anonymous> (node_modules/nyc/bin/wrap.js:23:4)
    
      Object.<anonymous> (node_modules/esm/esm.js:1:227183)
    
      node_modules/esm/esm.js:1:222656
    
      Generator.next (<anonymous>)
    
      cu (node_modules/esm/esm.js:1:223009)
    
      yu (node_modules/esm/esm.js:1:225201)
    
      Object.p (node_modules/esm/esm.js:1:261393)
    
      Object.<anonymous> (node_modules/esm/esm.js:1:260750)
    
      Object.<anonymous> (node_modules/esm/esm.js:1:258671)
    
      Object.apply (node_modules/esm/esm.js:1:182783)
    
      node_modules/esm/esm.js:1:211446
    
      node_modules/esm/esm.js:1:211481
    
      node_modules/esm/esm.js:1:211686
    
      yl (node_modules/esm/esm.js:1:209574)
    
      wl (node_modules/esm/esm.js:1:210888)
    
      gc (node_modules/esm/esm.js:1:233442)
    
      Proxy.<anonymous> (node_modules/esm/esm.js:1:268669)
    
      Proxy.<anonymous> (node_modules/esm/esm.js:1:268478)
    
      Proxy.<anonymous> (node_modules/esm/esm.js:1:258671)
    
      Object.apply (node_modules/esm/esm.js:1:182783)
    
      Object.<anonymous> (node_modules/esm/esm.js:1:227183)
    
      node_modules/esm/esm.js:1:222656
    
      Generator.next (<anonymous>)
    
      cu (node_modules/esm/esm.js:1:223009)
    
      yu (node_modules/esm/esm.js:1:225201)
    
      Object.p (node_modules/esm/esm.js:1:261393)
    
      Object.<anonymous> (node_modules/esm/esm.js:1:260750)
    
      Object.<anonymous> (node_modules/esm/esm.js:1:258671)
    
      Object.apply (node_modules/esm/esm.js:1:182783)
    
      node_modules/esm/esm.js:1:211446
    
      node_modules/esm/esm.js:1:211481
    
      node_modules/esm/esm.js:1:211686
    
      yl (node_modules/esm/esm.js:1:209574)
    
      wl (node_modules/esm/esm.js:1:210888)
    
      gc (node_modules/esm/esm.js:1:233442)
    
      Function.<anonymous> (node_modules/esm/esm.js:1:268669)
    
      Function.<anonymous> (node_modules/esm/esm.js:1:268478)
    
      Function.<anonymous> (node_modules/esm/esm.js:1:258671)
    
      Object.apply (node_modules/esm/esm.js:1:182783)
    source: >
      (function (exports, require, module, __filename, __dirname) { var test =
      require('tap').test
  
  request is boom error
  not ok reply.continue called
    +++ found                                                           
    --- wanted                                                          
    -true                                                               
    +false                                                              
    compare: ===
    at:
      line: 1
      column: 6339
      file: tests/index.js
      type: Test
    stack: >
      Test.<anonymous> (tests/index.js:1:6339)
    
      Object.<anonymous> (tests/index.js:1:5517)
    
      Object.<anonymous> (node_modules/esm/esm.js:1:227183)
    
      node_modules/esm/esm.js:1:222656
    
      Generator.next (<anonymous>)
    
      cu (node_modules/esm/esm.js:1:223009)
    
      yu (node_modules/esm/esm.js:1:225201)
    
      p (node_modules/esm/esm.js:1:261393)
    
      node_modules/esm/esm.js:1:260750
    
      node_modules/esm/esm.js:1:258671
    
      Object.apply (node_modules/esm/esm.js:1:182783)
    
      Object.<anonymous>
      (node_modules/nyc/node_modules/append-transform/index.js:62:4)
    
      node_modules/esm/esm.js:1:211446
    
      node_modules/esm/esm.js:1:211481
    
      node_modules/esm/esm.js:1:211686
    
      yl (node_modules/esm/esm.js:1:209574)
    
      wl (node_modules/esm/esm.js:1:210888)
    
      gc (node_modules/esm/esm.js:1:233442)
    
      Proxy.<anonymous> (node_modules/esm/esm.js:1:268669)
    
      Proxy.<anonymous> (node_modules/esm/esm.js:1:268478)
    
      Proxy.<anonymous> (node_modules/esm/esm.js:1:258671)
    
      Object.apply (node_modules/esm/esm.js:1:182783)
    
      Object.<anonymous> (node_modules/nyc/bin/wrap.js:23:4)
    
      Object.<anonymous> (node_modules/esm/esm.js:1:227183)
    
      node_modules/esm/esm.js:1:222656
    
      Generator.next (<anonymous>)
    
      cu (node_modules/esm/esm.js:1:223009)
    
      yu (node_modules/esm/esm.js:1:225201)
    
      Object.p (node_modules/esm/esm.js:1:261393)
    
      Object.<anonymous> (node_modules/esm/esm.js:1:260750)
    
      Object.<anonymous> (node_modules/esm/esm.js:1:258671)
    
      Object.apply (node_modules/esm/esm.js:1:182783)
    
      node_modules/esm/esm.js:1:211446
    
      node_modules/esm/esm.js:1:211481
    
      node_modules/esm/esm.js:1:211686
    
      yl (node_modules/esm/esm.js:1:209574)
    
      wl (node_modules/esm/esm.js:1:210888)
    
      gc (node_modules/esm/esm.js:1:233442)
    
      Proxy.<anonymous> (node_modules/esm/esm.js:1:268669)
    
      Proxy.<anonymous> (node_modules/esm/esm.js:1:268478)
    
      Proxy.<anonymous> (node_modules/esm/esm.js:1:258671)
    
      Object.apply (node_modules/esm/esm.js:1:182783)
    
      Object.<anonymous> (node_modules/esm/esm.js:1:227183)
    
      node_modules/esm/esm.js:1:222656
    
      Generator.next (<anonymous>)
    
      cu (node_modules/esm/esm.js:1:223009)
    
      yu (node_modules/esm/esm.js:1:225201)
    
      Object.p (node_modules/esm/esm.js:1:261393)
    
      Object.<anonymous> (node_modules/esm/esm.js:1:260750)
    
      Object.<anonymous> (node_modules/esm/esm.js:1:258671)
    
      Object.apply (node_modules/esm/esm.js:1:182783)
    
      node_modules/esm/esm.js:1:211446
    
      node_modules/esm/esm.js:1:211481
    
      node_modules/esm/esm.js:1:211686
    
      yl (node_modules/esm/esm.js:1:209574)
    
      wl (node_modules/esm/esm.js:1:210888)
    
      gc (node_modules/esm/esm.js:1:233442)
    
      Function.<anonymous> (node_modules/esm/esm.js:1:268669)
    
      Function.<anonymous> (node_modules/esm/esm.js:1:268478)
    
      Function.<anonymous> (node_modules/esm/esm.js:1:258671)
    
      Object.apply (node_modules/esm/esm.js:1:182783)
    source: >
      (function (exports, require, module, __filename, __dirname) { var test =
      require('tap').test
  
  options request without acces-control-request headers
  not ok reply.continue called
    +++ found                                                           
    --- wanted                                                          
    -true                                                               
    +false                                                              
    compare: ===
    at:
      line: 1
      column: 7561
      file: tests/index.js
      type: Test
    stack: >
      Test.<anonymous> (tests/index.js:1:7561)
    
      Object.<anonymous> (tests/index.js:1:6447)
    
      Object.<anonymous> (node_modules/esm/esm.js:1:227183)
    
      node_modules/esm/esm.js:1:222656
    
      Generator.next (<anonymous>)
    
      cu (node_modules/esm/esm.js:1:223009)
    
      yu (node_modules/esm/esm.js:1:225201)
    
      p (node_modules/esm/esm.js:1:261393)
    
      node_modules/esm/esm.js:1:260750
    
      node_modules/esm/esm.js:1:258671
    
      Object.apply (node_modules/esm/esm.js:1:182783)
    
      Object.<anonymous>
      (node_modules/nyc/node_modules/append-transform/index.js:62:4)
    
      node_modules/esm/esm.js:1:211446
    
      node_modules/esm/esm.js:1:211481
    
      node_modules/esm/esm.js:1:211686
    
      yl (node_modules/esm/esm.js:1:209574)
    
      wl (node_modules/esm/esm.js:1:210888)
    
      gc (node_modules/esm/esm.js:1:233442)
    
      Proxy.<anonymous> (node_modules/esm/esm.js:1:268669)
    
      Proxy.<anonymous> (node_modules/esm/esm.js:1:268478)
    
      Proxy.<anonymous> (node_modules/esm/esm.js:1:258671)
    
      Object.apply (node_modules/esm/esm.js:1:182783)
    
      Object.<anonymous> (node_modules/nyc/bin/wrap.js:23:4)
    
      Object.<anonymous> (node_modules/esm/esm.js:1:227183)
    
      node_modules/esm/esm.js:1:222656
    
      Generator.next (<anonymous>)
    
      cu (node_modules/esm/esm.js:1:223009)
    
      yu (node_modules/esm/esm.js:1:225201)
    
      Object.p (node_modules/esm/esm.js:1:261393)
    
      Object.<anonymous> (node_modules/esm/esm.js:1:260750)
    
      Object.<anonymous> (node_modules/esm/esm.js:1:258671)
    
      Object.apply (node_modules/esm/esm.js:1:182783)
    
      node_modules/esm/esm.js:1:211446
    
      node_modules/esm/esm.js:1:211481
    
      node_modules/esm/esm.js:1:211686
    
      yl (node_modules/esm/esm.js:1:209574)
    
      wl (node_modules/esm/esm.js:1:210888)
    
      gc (node_modules/esm/esm.js:1:233442)
    
      Proxy.<anonymous> (node_modules/esm/esm.js:1:268669)
    
      Proxy.<anonymous> (node_modules/esm/esm.js:1:268478)
    
      Proxy.<anonymous> (node_modules/esm/esm.js:1:258671)
    
      Object.apply (node_modules/esm/esm.js:1:182783)
    
      Object.<anonymous> (node_modules/esm/esm.js:1:227183)
    
      node_modules/esm/esm.js:1:222656
    
      Generator.next (<anonymous>)
    
      cu (node_modules/esm/esm.js:1:223009)
    
      yu (node_modules/esm/esm.js:1:225201)
    
      Object.p (node_modules/esm/esm.js:1:261393)
    
      Object.<anonymous> (node_modules/esm/esm.js:1:260750)
    
      Object.<anonymous> (node_modules/esm/esm.js:1:258671)
    
      Object.apply (node_modules/esm/esm.js:1:182783)
    
      node_modules/esm/esm.js:1:211446
    
      node_modules/esm/esm.js:1:211481
    
      node_modules/esm/esm.js:1:211686
    
      yl (node_modules/esm/esm.js:1:209574)
    
      wl (node_modules/esm/esm.js:1:210888)
    
      gc (node_modules/esm/esm.js:1:233442)
    
      Function.<anonymous> (node_modules/esm/esm.js:1:268669)
    
      Function.<anonymous> (node_modules/esm/esm.js:1:268478)
    
      Function.<anonymous> (node_modules/esm/esm.js:1:258671)
    
      Object.apply (node_modules/esm/esm.js:1:182783)
    source: >
      (function (exports, require, module, __filename, __dirname) { var test =
      require('tap').test
  
  options request
  not ok reply.continue called
    +++ found                                                           
    --- wanted                                                          
    -true                                                               
    +false                                                              
    compare: ===
    at:
      line: 1
      column: 8814
      file: tests/index.js
      type: Test
    stack: >
      Test.<anonymous> (tests/index.js:1:8814)
    
      Object.<anonymous> (tests/index.js:1:7669)
    
      Object.<anonymous> (node_modules/esm/esm.js:1:227183)
    
      node_modules/esm/esm.js:1:222656
    
      Generator.next (<anonymous>)
    
      cu (node_modules/esm/esm.js:1:223009)
    
      yu (node_modules/esm/esm.js:1:225201)
    
      p (node_modules/esm/esm.js:1:261393)
    
      node_modules/esm/esm.js:1:260750
    
      node_modules/esm/esm.js:1:258671
    
      Object.apply (node_modules/esm/esm.js:1:182783)
    
      Object.<anonymous>
      (node_modules/nyc/node_modules/append-transform/index.js:62:4)
    
      node_modules/esm/esm.js:1:211446
    
      node_modules/esm/esm.js:1:211481
    
      node_modules/esm/esm.js:1:211686
    
      yl (node_modules/esm/esm.js:1:209574)
    
      wl (node_modules/esm/esm.js:1:210888)
    
      gc (node_modules/esm/esm.js:1:233442)
    
      Proxy.<anonymous> (node_modules/esm/esm.js:1:268669)
    
      Proxy.<anonymous> (node_modules/esm/esm.js:1:268478)
    
      Proxy.<anonymous> (node_modules/esm/esm.js:1:258671)
    
      Object.apply (node_modules/esm/esm.js:1:182783)
    
      Object.<anonymous> (node_modules/nyc/bin/wrap.js:23:4)
    
      Object.<anonymous> (node_modules/esm/esm.js:1:227183)
    
      node_modules/esm/esm.js:1:222656
    
      Generator.next (<anonymous>)
    
      cu (node_modules/esm/esm.js:1:223009)
    
      yu (node_modules/esm/esm.js:1:225201)
    
      Object.p (node_modules/esm/esm.js:1:261393)
    
      Object.<anonymous> (node_modules/esm/esm.js:1:260750)
    
      Object.<anonymous> (node_modules/esm/esm.js:1:258671)
    
      Object.apply (node_modules/esm/esm.js:1:182783)
    
      node_modules/esm/esm.js:1:211446
    
      node_modules/esm/esm.js:1:211481
    
      node_modules/esm/esm.js:1:211686
    
      yl (node_modules/esm/esm.js:1:209574)
    
      wl (node_modules/esm/esm.js:1:210888)
    
      gc (node_modules/esm/esm.js:1:233442)
    
      Proxy.<anonymous> (node_modules/esm/esm.js:1:268669)
    
      Proxy.<anonymous> (node_modules/esm/esm.js:1:268478)
    
      Proxy.<anonymous> (node_modules/esm/esm.js:1:258671)
    
      Object.apply (node_modules/esm/esm.js:1:182783)
    
      Object.<anonymous> (node_modules/esm/esm.js:1:227183)
    
      node_modules/esm/esm.js:1:222656
    
      Generator.next (<anonymous>)
    
      cu (node_modules/esm/esm.js:1:223009)
    
      yu (node_modules/esm/esm.js:1:225201)
    
      Object.p (node_modules/esm/esm.js:1:261393)
    
      Object.<anonymous> (node_modules/esm/esm.js:1:260750)
    
      Object.<anonymous> (node_modules/esm/esm.js:1:258671)
    
      Object.apply (node_modules/esm/esm.js:1:182783)
    
      node_modules/esm/esm.js:1:211446
    
      node_modules/esm/esm.js:1:211481
    
      node_modules/esm/esm.js:1:211686
    
      yl (node_modules/esm/esm.js:1:209574)
    
      wl (node_modules/esm/esm.js:1:210888)
    
      gc (node_modules/esm/esm.js:1:233442)
    
      Function.<anonymous> (node_modules/esm/esm.js:1:268669)
    
      Function.<anonymous> (node_modules/esm/esm.js:1:268478)
    
      Function.<anonymous> (node_modules/esm/esm.js:1:258671)
    
      Object.apply (node_modules/esm/esm.js:1:182783)
    source: >
      (function (exports, require, module, __filename, __dirname) { var test =
      require('tap').test

total ............................................... 14/18
  

  14 passing (2s)
  4 failing

ERROR: Coverage for lines (93.75%) does not meet global threshold (100%)
ERROR: Coverage for functions (55.56%) does not meet global threshold (100%)
ERROR: Coverage for statements (93.75%) does not meet global threshold (100%)
-------------------------|----------|----------|----------|----------|-------------------|
File                     |  % Stmts | % Branch |  % Funcs |  % Lines | Uncovered Line #s |
-------------------------|----------|----------|----------|----------|-------------------|
All files                |    93.75 |      100 |    55.56 |    93.75 |                   |
 hapi-cors-headers       |      100 |      100 |      100 |      100 |                   |
  index.js               |      100 |      100 |      100 |      100 |                   |
 hapi-cors-headers/tests |    91.67 |      100 |       50 |    91.67 |                   |
  index.js               |    91.67 |      100 |       50 |    91.67 |       11,36,61,89 |
-------------------------|----------|----------|----------|----------|-------------------|

I'm sure you can fix it! If you need help, don't hesitate to ask a maintainer of the project!


This comment was automagically generated by ci-reporter. If you see a problem, open an issue here.

Copy link
Owner

@gr2m gr2m left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you make it so it works in both, hapi < 17 & hapi 17+?

@bloodf
Copy link
Author

bloodf commented Jan 30, 2019

In the same code is not possible.

The API has changed.

You will need to release a new version for 17+

if (!request.headers.origin) {
return reply.continue()
return h.continue
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you check here if h.continue is a function and if it is, return h.continue(), otherwise return h.continue?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

they are both functions.
The Hapi team, made the call different. The plugins that works on 17+ wont work on earlier versions. So most of the plugins have a break change version. Like 1.0 works with 16- 2.0 17+

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay, got it. It’s fine, I can release a breaking version. Can you check that the tests pass? Please compare with the other open PRs 🙏 Thanks!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants