From dbc0823a77f7f45208bf715786e215b42d2de336 Mon Sep 17 00:00:00 2001 From: Boaz Leskes Date: Tue, 30 Jul 2013 14:00:23 +0200 Subject: [PATCH] Added version skip commands for source filtering tests --- rest-api-spec/test/explain/10_basic.yaml | 4 ++-- .../test/explain/10_source_filtering.yaml | 3 +++ rest-api-spec/test/get/20_fields.yaml | 14 -------------- .../test/get/70_source_filtering.yaml | 18 ++++++++++++++++++ .../test/get_source/70_source_filtering.yaml | 3 +++ .../test/mget/70_source_filtering.yaml | 3 +++ .../test/search/10_source_filtering.yaml | 3 +++ 7 files changed, 32 insertions(+), 16 deletions(-) diff --git a/rest-api-spec/test/explain/10_basic.yaml b/rest-api-spec/test/explain/10_basic.yaml index 1286dd422d2..94068af5b41 100644 --- a/rest-api-spec/test/explain/10_basic.yaml +++ b/rest-api-spec/test/explain/10_basic.yaml @@ -18,8 +18,8 @@ body: query: match_all: {} - + - is_true: matched - is_true: ok - - match: {explanation.value: 1.0} + - match: { explanation.value: 1.0 } diff --git a/rest-api-spec/test/explain/10_source_filtering.yaml b/rest-api-spec/test/explain/10_source_filtering.yaml index ecdc7173dfa..50e50acd4b8 100644 --- a/rest-api-spec/test/explain/10_source_filtering.yaml +++ b/rest-api-spec/test/explain/10_source_filtering.yaml @@ -1,5 +1,8 @@ --- "Source filtering": + - skip: + version: "0 - 0.90.999" + reason: "source filtering is not supported in pre 1.0 versions." - do: index: diff --git a/rest-api-spec/test/get/20_fields.yaml b/rest-api-spec/test/get/20_fields.yaml index f143b13039f..6d85c5d86f5 100644 --- a/rest-api-spec/test/get/20_fields.yaml +++ b/rest-api-spec/test/get/20_fields.yaml @@ -20,20 +20,6 @@ - match: { fields.foo: bar } - is_false: _source - - do: - get: - index: test_1 - type: test - id: 1 - fields: foo - _source: true - - - match: { _index: test_1 } - - match: { _type: test } - - match: { _id: 1 } - - match: { fields.foo: bar } - - match: { _source.foo: bar } - - do: get: index: test_1 diff --git a/rest-api-spec/test/get/70_source_filtering.yaml b/rest-api-spec/test/get/70_source_filtering.yaml index ad0466f3a79..01394fcffec 100644 --- a/rest-api-spec/test/get/70_source_filtering.yaml +++ b/rest-api-spec/test/get/70_source_filtering.yaml @@ -1,5 +1,8 @@ --- "Source filtering": + - skip: + version: "0 - 0.90.999" + reason: "source filtering is not supported in pre 1.0 versions." - do: index: @@ -40,3 +43,18 @@ - match: { _source.include.field1: v1 } - is_false: _source.include.field2 - is_false: _source.count + + + - do: + get: + index: test_1 + type: test + id: 1 + fields: count + _source: true + + - match: { _index: test_1 } + - match: { _type: test } + - match: { _id: 1 } + - match: { fields.count: 1 } + - match: { _source.include.field1: v1 } diff --git a/rest-api-spec/test/get_source/70_source_filtering.yaml b/rest-api-spec/test/get_source/70_source_filtering.yaml index 10a5aead213..b8658287fb5 100644 --- a/rest-api-spec/test/get_source/70_source_filtering.yaml +++ b/rest-api-spec/test/get_source/70_source_filtering.yaml @@ -1,5 +1,8 @@ --- "Source filtering": + - skip: + version: "0 - 0.90.999" + reason: "source filtering is not supported in pre 1.0 versions." - do: index: diff --git a/rest-api-spec/test/mget/70_source_filtering.yaml b/rest-api-spec/test/mget/70_source_filtering.yaml index 715fb378f18..6aa83be4405 100644 --- a/rest-api-spec/test/mget/70_source_filtering.yaml +++ b/rest-api-spec/test/mget/70_source_filtering.yaml @@ -1,5 +1,8 @@ --- "Source filtering": + - skip: + version: "0 - 0.90.999" + reason: "source filtering is not supported in pre 1.0 versions." - do: index: diff --git a/rest-api-spec/test/search/10_source_filtering.yaml b/rest-api-spec/test/search/10_source_filtering.yaml index a078f89d1fd..32a7f360fd4 100644 --- a/rest-api-spec/test/search/10_source_filtering.yaml +++ b/rest-api-spec/test/search/10_source_filtering.yaml @@ -1,5 +1,8 @@ --- "Source filtering": + - skip: + version: "0 - 0.90.999" + reason: "source filtering is not supported in pre 1.0 versions." - do: index: