diff -u b/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php b/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php --- b/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php +++ b/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php @@ -68,7 +68,7 @@ } public function _testSimpleFieldRender() { - $view = $this->getFieldView(); + $view = $this->getFieldView()->cloneView(); $this->executeView($view); // Tests that the rendered fields match the actual value of the fields. @@ -86,7 +86,7 @@ * Tests that fields with formatters runs as expected. */ public function _testFormatterSimpleFieldRender() { - $view = $this->getFieldView(); + $view = $this->getFieldView()->cloneView(); $view->display['default']->display_options['fields'][$this->fields[0]['field_name']]['type'] = 'text_trimmed'; $view->display['default']->display_options['fields'][$this->fields[0]['field_name']]['settings'] = array( 'trim_length' => 3, @@ -102,7 +102,7 @@ } public function _testMultipleFieldRender() { - $view = $this->getFieldView(); + $view = $this->getFieldView()->cloneView(); // Test delta limit. $view->display['default']->display_options['fields'][$this->fields[3]['field_name']]['group_rows'] = TRUE; diff -u b/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php b/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php --- b/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php +++ b/lib/Drupal/views/Tests/Plugin/ArgumentValidatorTest.php @@ -45,7 +45,7 @@ function view_test_argument_validate_php($string) { $code = 'return $argument == \''. $string .'\';'; - $view = $this->createViewFromConfig('test_view_argument_validate_numeric'); + $view = $this->createViewFromConfig('test_view_argument_validate_php'); $view->display['default']->handler->options['arguments']['null']['validate_options']['code'] = $code; return $view; diff -u b/lib/Drupal/views/Tests/TranslatableTest.php b/lib/Drupal/views/Tests/TranslatableTest.php --- b/lib/Drupal/views/Tests/TranslatableTest.php +++ b/lib/Drupal/views/Tests/TranslatableTest.php @@ -104,7 +104,7 @@ * Make sure that the different things have the right translation keys. */ public function testTranslationKey() { - $view = $this->view_unpack_translatable(); + $view = $this->view_unpack_translatable()->cloneView(); $view->editing = TRUE; $view->initDisplay(); diff -u b/tests/views_test_config/config/views.view.test_view_argument_validate_numeric.yml b/tests/views_test_config/config/views.view.test_store_pager_settings.yml --- b/tests/views_test_config/config/views.view.test_view_argument_validate_numeric.yml +++ b/tests/views_test_config/config/views.view.test_store_pager_settings.yml @@ -10,26 +10,16 @@ type: none - arguments: - 'null': - default_argument_type: fixed - field: 'null' - id: 'null' - must_not_be: '0' - style_plugin: default_summary - table: views - validate: - type: php cache: type: none exposed_form: type: basic pager: - type: full - row_plugin: fields + type: none + row_plugin: node style_plugin: default display_plugin: default display_title: Master id: default position: '0' human_name: '' -name: test_view_argument_validate_numeric +name: test_store_pager_settings tag: '' diff -u b/tests/views_test_config/config/views.view.test_view_argument_validate_user.yml b/tests/views_test_config/config/views.view.test_store_pager_settings.yml --- b/tests/views_test_config/config/views.view.test_view_argument_validate_user.yml +++ b/tests/views_test_config/config/views.view.test_store_pager_settings.yml @@ -10,26 +10,16 @@ type: none - arguments: - 'null': - default_argument_type: fixed - field: 'null' - id: 'null' - must_not_be: '0' - style_plugin: default_summary - table: views - validate: - type: user cache: type: none exposed_form: type: basic pager: - type: full - row_plugin: fields + type: none + row_plugin: node style_plugin: default display_plugin: default display_title: Master id: default position: '0' human_name: '' -name: test_view_argument_validate_user +name: test_store_pager_settings tag: '' diff -u b/tests/views_test_config/config/views.view.test_view_pager_full_zero_items_per_page.yml b/tests/views_test_config/config/views.view.test_plugin_argument_default_current_user.yml --- b/tests/views_test_config/config/views.view.test_view_pager_full_zero_items_per_page.yml +++ b/tests/views_test_config/config/views.view.test_plugin_argument_default_current_user.yml @@ -8,6 +8,15 @@ display_options: access: type: none + arguments: + 'null': + default_action: default + default_argument_type: current_user + field: 'null' + id: 'null' + must_not_be: '0' + style_plugin: default_summary + table: views cache: type: none exposed_form: @@ -31,7 +40,7 @@ pager: options: id: '0' - items_per_page: '0' + items_per_page: '10' offset: '0' type: full row_plugin: fields @@ -43,3 +52,3 @@ human_name: '' -name: test_view_pager_full_zero_items_per_page +name: test_plugin_argument_default_current_user tag: '' diff -u b/tests/views_test_config/config/views.view.test_views_handler_field_user_name.yml b/tests/views_test_config/config/views.view.test_plugin_argument_default_current_user.yml --- b/tests/views_test_config/config/views.view.test_views_handler_field_user_name.yml +++ b/tests/views_test_config/config/views.view.test_plugin_argument_default_current_user.yml @@ -1,5 +1,5 @@ api_version: '3.0' -base_table: users +base_table: node core: '8' description: '' disabled: '0' @@ -11,38 +11,44 @@ + arguments: + 'null': + default_action: default + default_argument_type: current_user + field: 'null' + id: 'null' + must_not_be: '0' + style_plugin: default_summary + table: views cache: type: none exposed_form: type: basic fields: - name: + title: alter: - absolute: '0' alter_text: '0' - ellipsis: '0' + ellipsis: '1' html: '0' make_link: '0' strip_tags: '0' trim: '0' - word_boundary: '0' + word_boundary: '1' empty_zero: '0' - field: name + field: title hide_empty: '0' - id: name - label: '' - link_to_user: '1' - overwrite_anonymous: '0' - table: users + id: title + link_to_node: '0' + table: node pager: - type: full - query: options: - query_comment: '0' - type: views_query + id: '0' + items_per_page: '10' + offset: '0' + type: full row_plugin: fields style_plugin: default display_plugin: default display_title: Master id: default position: '0' -human_name: test_views_handler_field_user_name -name: test_views_handler_field_user_name -tag: default +human_name: '' +name: test_plugin_argument_default_current_user +tag: '' diff -u b/tests/views_test_data/config/views.view.test_argument_default_current_user.yml b/tests/views_test_config/config/views.view.test_plugin_argument_default_current_user.yml --- b/tests/views_test_data/config/views.view.test_argument_default_current_user.yml +++ b/tests/views_test_config/config/views.view.test_plugin_argument_default_current_user.yml @@ -9,11 +9,14 @@ access: type: none arguments: - uid: + 'null': default_action: default - field: uid - id: uid - table: node + default_argument_type: current_user + field: 'null' + id: 'null' + must_not_be: '0' + style_plugin: default_summary + table: views cache: type: none exposed_form: @@ -49,3 +52,3 @@ human_name: '' -name: test_argument_default_current_user +name: test_plugin_argument_default_current_user tag: '' diff -u b/tests/views_test_data/config/views.view.test_filter_in_operator_ui.yml b/tests/views_test_config/config/views.view.test_view_argument_validate_numeric.yml --- b/tests/views_test_data/config/views.view.test_filter_in_operator_ui.yml +++ b/tests/views_test_config/config/views.view.test_view_argument_validate_numeric.yml @@ -8,22 +8,20 @@ display_options: access: type: none + arguments: + 'null': + default_argument_type: fixed + field: 'null' + id: 'null' + must_not_be: '0' + style_plugin: default_summary + table: views + validate: + type: numeric cache: type: none exposed_form: type: basic - filters: - type: - expose: - identifier: type - label: 'Content: Type' - operator_id: type_op - reduce: '0' - use_operator: '0' - exposed: '1' - field: type - id: type - table: node pager: type: full row_plugin: fields @@ -35,3 +33,3 @@ human_name: '' -name: test_filter_in_operator_ui +name: test_view_argument_validate_numeric tag: '' diff -u b/tests/views_test_data/config/views.view.test_views_groupby_save.yml b/tests/views_test_config/config/views.view.test_store_pager_settings.yml --- b/tests/views_test_data/config/views.view.test_views_groupby_save.yml +++ b/tests/views_test_config/config/views.view.test_store_pager_settings.yml @@ -16,10 +16,10 @@ type: none - row_plugin: fields + row_plugin: node style_plugin: default display_plugin: default display_title: Master id: default position: '0' human_name: '' -name: test_views_groupby_save +name: test_store_pager_settings tag: '' diff -u b/tests/views_test_data/views_test_data.module b/tests/views_test_data/views_test_data.module --- b/tests/views_test_data/views_test_data.module +++ b/tests/views_test_data/views_test_data.module @@ -25,7 +25,7 @@ function views_test_data_views_api() { return array( 'api' => 3.0, - 'template path' => drupal_get_path('module', 'views_test') . '/templates', + 'template path' => drupal_get_path('module', 'views_test_data') . '/templates', ); } only in patch2: unchanged: --- a/lib/Drupal/views/Tests/BasicTest.php +++ b/lib/Drupal/views/Tests/BasicTest.php @@ -174,7 +174,7 @@ class BasicTest extends ViewTestBase { )); // Test "show all" if no argument is present. - $view = $saved_view; + $view = $saved_view->cloneView(); $this->executeView($view); // Build the expected result.