Merge branch 'nofields-features-pending' into pl-master

Tim Hinderliter · Tim Hinderliter · commit ed9b7f4b3583 · 2010-11-08T16:49:37.000-08:00
diff --git 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
@@ -23,4 +23,8 @@
 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

-Original file line number
+Diff line change
 expected_klass=eval(result_item_klass)
 result_item.shouldbe_a_kind_of(expected_klass)
 +end
++
 +Given"PL-540 is resolved in favor of not removing this feature"do
 +pending
 end