Fix alternatives description (#851)

hapijs · Mar 18, 2016 · e5b5293 · e5b5293
1 parent e60b712
commit e5b5293
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/lib/alternatives.js b/lib/alternatives.js
@@ -130,7 +130,7 @@ internals.Alternatives.prototype.when = function (ref, options) {
 
 internals.Alternatives.prototype.describe = function () {
 
- const description = Any.prototype.describe.call(Hoek.reach(this, '_settings.baseType', { default: this }));
+ const description = Any.prototype.describe.call(this);
  const alternatives = [];
  for (let i = 0; i < this._inner.matches.length; ++i) {
  const item = this._inner.matches[i];

diff --git a/test/any.js b/test/any.js
@@ -1425,9 +1425,10 @@ describe('any', () => {
 
  const schema = Joi.number().min(10).when('a', { is: 5, then: Joi.number().max(20).required() }).describe();
  expect(schema).to.deep.equal({
- type: 'number',
- invalids: [Infinity, -Infinity],
- rules: [{ name: 'min', arg: 10 }],
+ type: 'alternatives',
+ flags: {
+ presence: 'ignore'
+ },
  alternatives: [{
  ref: 'ref:a',
  is: {

diff --git a/test/ref.js b/test/ref.js
@@ -372,10 +372,8 @@ describe('ref', () => {
  .describe();
 
  expect(desc).to.deep.equal({
- type: 'any',
- flags: { allowOnly: true, default: 'ref:a.b' },
- valids: ['ref:a.b'],
- invalids: ['context:b.c'],
+ type: 'alternatives',
+ flags: { presence: 'ignore' },
  alternatives: [{
  ref: 'ref:a.b',
  is: {