Adjust some tests

Author: swissspidy

features/db-columns.feature

@@ -1,7 +1,7 @@
 Feature: Display information about a given table.
 
   # This requires conditional tags to target different DB versions, as bigint(20) is only bigint on MySQL 8.
-  @require-wp-4.2 @broken
+  @broken
   Scenario: Display information about the wp_posts table
     Given a WP install
 

features/db-import.feature

@@ -151,7 +151,7 @@ Feature: Import a WordPress database
     When I try `wp db import --no-defaults --debug`
     Then STDERR should match #Debug \(db\): Running shell command: /usr/bin/env (mysql|mariadb) --no-defaults --no-auto-rehash#
 
-  @require-wp-4.2 @require-mysql-or-mariadb
+  @require-mysql-or-mariadb
   Scenario: Import db that has emoji in post
     Given a WP install
 
@@ -188,7 +188,7 @@ Feature: Import a WordPress database
       🍣
       """
 
-  @require-wp-4.2 @require-sqlite
+  @require-sqlite
   Scenario: Import db that has emoji in post
     Given a WP install
 

features/db-search.feature

@@ -872,7 +872,6 @@ Feature: Search through the database
     When I run `wp db search 'https://' --regex`
     Then the return code should be 0
 
-  @require-wp-4.7
   Scenario: Search with output options
     Given a WP install
 
@@ -1002,9 +1001,8 @@ Feature: Search through the database
       INSERT INTO `TABLE` (`VALUES`, `back``tick`, `single'double"quote`) VALUES ('v"v`v\'v\\v_v1', 'v"v`v\'v\\v_v1', 'v"v`v\'v\\v_v1' );
       INSERT INTO `TABLE` (`VALUES`, `back``tick`, `single'double"quote`) VALUES ('v"v`v\'v\\v_v2', 'v"v`v\'v\\v_v2', 'v"v`v\'v\\v_v2' );
       """
-    And save the {RUN_DIR}/esc_sql_ident.sql file as {QUERY}
-    When I run `wp db query 'CREATE TABLE `TABLE` (`KEY` INT(11) UNSIGNED NOT NULL AUTO_INCREMENT, `VALUES` TEXT, `back``tick` TEXT, `single\'double"quote` TEXT, PRIMARY KEY (`KEY`) );'`
-    And I run `wp db query 'INSERT INTO `TABLE` (`VALUES`, `back``tick`, `single\'double"quote`) VALUES (\'v"v`v\\'v\\v_v1', \'v"v`v\\'v\\v_v1\', \'v"v`v\\'v\\v_v1\' );'`
+
+    When I run `wp db query "SOURCE esc_sql_ident.sql;"`
     Then STDERR should be empty
 
     When I run `wp db search 'v_v' TABLE --all-tables`

features/db-tables.feature

@@ -43,9 +43,7 @@ Feature: List database tables
     When I run `wp db tables`
     Then STDOUT should contain:
       """
-      _mysql_data_types_cache
       wp_users
-      sqlite_sequence
       wp_usermeta
       wp_termmeta
       wp_terms
@@ -162,9 +160,7 @@ Feature: List database tables
     When I run `wp db tables`
     Then STDOUT should contain:
       """
-      _mysql_data_types_cache
       wp_users
-      sqlite_sequence
       wp_usermeta
       wp_termmeta
       wp_terms
@@ -329,11 +325,14 @@ Feature: List database tables
       """
 
     When I run `wp db tables '*_posts' --network`
-    Then STDOUT should be:
+    Then STDOUT should contain:
       """
-      as_wp_2_posts
       as_wp_posts
       """
+    And STDOUT should contain:
+      """
+      as_wp_2_posts
+      """
 
     When I run `wp db tables '*_posts' --scope=blog`
     Then STDOUT should be: