Fixed variables trait not preserving declared valriables.

src/D7/VariableTrait.php

@@ -158,7 +158,7 @@ protected function variableCleanupTestVariables() {
   protected function variableRefresh() {
     global $conf;
     cache_clear_all('variables', 'cache_bootstrap');
-    $conf = variable_initialize();
+    $conf = variable_initialize($conf);
   }
 
 }

tests/behat/features/d7.variable.feature

@@ -60,3 +60,19 @@ Feature: Check that variable assertions work for D7
     Line3
     """
     And I delete test variable "random_test_var6"
+
+  @api
+  Scenario: Preserving variables set in settings
+    Given variable "test_var" has value "123"
+    When I set test variable "random_test_var4" to value "init"
+    Then variable "random_test_var4" has value "init"
+    And variable "test_var" has value "123"
+
+  @api
+  Scenario: Overriding variables set in settings
+    Given variable "test_var" has value "123"
+    When I set test variable "random_test_var4" to value "init"
+    Then variable "random_test_var4" has value "init"
+    And variable "test_var" has value "123"
+    When I set variable "test_var" to value "456"
+    Then variable "test_var" has value "456"

tests/behat/fixtures/d7/composer.json

@@ -88,6 +88,7 @@
     },
     "scripts": {
         "drupal-post-install": [
+            "chmod 644 web/sites/default/settings.php; echo '$conf[\"test_var\"]=123;' >> web/sites/default/settings.php; chmod 444 web/sites/default/settings.php",
             "drush -r web en mysite_core -y"
         ]
     }