Issue #1331350 by beejeebus, plach, catch: Fixed [Upgrade path broken] Entity...

Issue #1331350 by beejeebus, plach, catch: Fixed [Upgrade path broken] Entity module not enabled during D8 upgrade.

core/includes/update.inc

@@ -142,7 +142,7 @@ function update_module_enable(array $modules) {
     db_update('system')
       ->condition('type', 'module')
       ->condition('name', $module)
-      ->fields(array('schema_version' => 0))
+      ->fields(array('schema_version' => 0, 'status' => 1))
       ->execute();
 
     system_list_reset();

core/modules/simpletest/tests/upgrade/upgrade.test

@@ -264,7 +264,7 @@ abstract class UpgradePathTestCase extends DrupalWebTestCase {
 
     // Go!
     $this->drupalPost(NULL, array(), t('Apply pending updates'));
-    if (!$this->assertResponse(200)) {
+    if (!$this->assertText('Updates were attempted')) {
       return FALSE;
     }
 
@@ -312,7 +312,9 @@ abstract class UpgradePathTestCase extends DrupalWebTestCase {
     $this->refreshVariables();
     $this->checkPermissions(array(), TRUE);
 
-    return TRUE;
+    // Check we can load the front page of the new site.
+    $this->drupalGet('');
+    return $this->assertText('Powered by Drupal', t('The front page of the upgraded site loads successfully.'));
   }
 
   /**

core/modules/simpletest/tests/upgrade/upgrade_bare.test

@@ -27,5 +27,8 @@ class BareUpgradePathTestCase extends UpgradePathTestCase {
    */
   public function testBareUpgrade() {
     $this->assertTrue($this->performUpgrade(), t('The upgrade was completed successfully.'));
+
+    // Ensure that the new Entity module is enabled after upgrade.
+    $this->assertTrue(module_exists('entity'), 'Entity module enabled after upgrade.');
   }
 }