diff options
| author | Tim Hinderliter <tim@opscode.com> | 2010-11-08 16:49:37 -0800 |
|---|---|---|
| committer | Tim Hinderliter <tim@opscode.com> | 2010-11-08 16:49:37 -0800 |
| commit | ed9b7f4b35830dca575058535278761abe006e31 (patch) | |
| tree | fcee713b06ce64cad497e7bbc8a1ce44b306f210 | |
| parent | ce069259a31719e8298ae388abd635b81c37de68 (diff) | |
| parent | 9e9281473dc8eea33dff5ed03ccd3330568c3fa3 (diff) | |
| download | chef-ed9b7f4b35830dca575058535278761abe006e31.tar.gz | |
Merge branch 'nofields-features-pending' into pl-master
| -rw-r--r-- | features/api/search/show_search.feature | 3 | ||||
| -rw-r--r-- | features/steps/search_steps.rb | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/features/api/search/show_search.feature b/features/api/search/show_search.feature index 3612907f0b..d52e562041 100644 --- a/features/api/search/show_search.feature +++ b/features/api/search/show_search.feature @@ -37,6 +37,7 @@ Feature: Search data via the REST API @oss_only Scenario: Search for objects with a manual ascending sort order + Given PL-450 is resolved in favor of not removing this feature Given I am an administrator And a 'data_bag' named 'users' exists And a 'data_bag_item' named 'francis' exists @@ -53,6 +54,7 @@ Feature: Search data via the REST API @oss_only Scenario: Search for objects with a manual descending sort order + Given PL-450 is resolved in favor of not removing this feature Given I am an administrator And a 'data_bag' named 'users' exists And a 'data_bag_item' named 'francis' exists @@ -69,6 +71,7 @@ Feature: Search data via the REST API @oss_only Scenario: Search for objects and page through the results + Given PL-450 is resolved in favor of not removing this feature Given I am an administrator And a 'data_bag' named 'users' exists And a 'data_bag_item' named 'francis' exists diff --git a/features/steps/search_steps.rb b/features/steps/search_steps.rb index 1d165abc97..d3fa04959c 100644 --- a/features/steps/search_steps.rb +++ b/features/steps/search_steps.rb @@ -23,4 +23,8 @@ Then "a '$result_item_klass' with id '$result_item_id' should be in the search r expected_klass = eval(result_item_klass) result_item.should be_a_kind_of(expected_klass) +end + +Given "PL-540 is resolved in favor of not removing this feature" do + pending end
\ No newline at end of file |