summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwebchick2011-05-28 18:16:53 (GMT)
committerwebchick2011-05-28 18:16:53 (GMT)
commit4fd8e38f46ea25bd56b9b5aed4617e1477d6a014 (patch)
treee8e2ea809aef6de6f219ca5edfc10e3e8e75260d
parentba9bcb2c7c263d490f6a1cb302fe8673350486f3 (diff)
Issue #647964 by jergason, bfroehle, Damien Tournoud, corbacho, Pancho: Fixed Running cron does not check for available updates.
-rw-r--r--modules/update/update.module1
-rw-r--r--modules/update/update.test31
2 files changed, 23 insertions, 9 deletions
diff --git a/modules/update/update.module b/modules/update/update.module
index a66cfa5..a2d705a 100644
--- a/modules/update/update.module
+++ b/modules/update/update.module
@@ -293,6 +293,7 @@ function update_cron() {
// the cached data for all projects, attempt to re-fetch, and trigger any
// configured notifications about the new status.
update_refresh();
+ update_fetch_data();
_update_cron_notify();
}
else {
diff --git a/modules/update/update.test b/modules/update/update.test
index 3affeb8..e72f4c5 100644
--- a/modules/update/update.test
+++ b/modules/update/update.test
@@ -134,6 +134,19 @@ class UpdateCoreTestCase extends UpdateTestHelper {
}
/**
+ * Check that running cron updates the list of available updates.
+ */
+ function testModulePageRunCron() {
+ $this->setSystemInfo7_0();
+ variable_set('update_fetch_url', url('update-test', array('absolute' => TRUE)));
+ variable_set('update_test_xml_map', array('drupal' => '0'));
+
+ $this->cronRun();
+ $this->drupalGet('admin/modules');
+ $this->assertNoText(t('No update information available.'));
+ }
+
+ /**
* Check the messages at admin/modules when the site is up to date.
*/
function testModulePageUpToDate() {
@@ -142,10 +155,10 @@ class UpdateCoreTestCase extends UpdateTestHelper {
variable_set('update_fetch_url', url('update-test', array('absolute' => TRUE)));
variable_set('update_test_xml_map', array('drupal' => '0'));
- $this->drupalGet('admin/modules');
- $this->assertText(t('No update information available.'));
- $this->clickLink(t('check manually'));
+ $this->drupalGet('admin/reports/updates');
+ $this->clickLink(t('Check manually'));
$this->assertText(t('Checked available update data for one project.'));
+ $this->drupalGet('admin/modules');
$this->assertNoText(t('There are updates available for your version of Drupal.'));
$this->assertNoText(t('There is a security update available for your version of Drupal.'));
}
@@ -159,10 +172,10 @@ class UpdateCoreTestCase extends UpdateTestHelper {
variable_set('update_fetch_url', url('update-test', array('absolute' => TRUE)));
variable_set('update_test_xml_map', array('drupal' => '1'));
- $this->drupalGet('admin/modules');
- $this->assertText(t('No update information available.'));
- $this->clickLink(t('check manually'));
+ $this->drupalGet('admin/reports/updates');
+ $this->clickLink(t('Check manually'));
$this->assertText(t('Checked available update data for one project.'));
+ $this->drupalGet('admin/modules');
$this->assertText(t('There are updates available for your version of Drupal.'));
$this->assertNoText(t('There is a security update available for your version of Drupal.'));
}
@@ -176,10 +189,10 @@ class UpdateCoreTestCase extends UpdateTestHelper {
variable_set('update_fetch_url', url('update-test', array('absolute' => TRUE)));
variable_set('update_test_xml_map', array('drupal' => '2-sec'));
- $this->drupalGet('admin/modules');
- $this->assertText(t('No update information available.'));
- $this->clickLink(t('check manually'));
+ $this->drupalGet('admin/reports/updates');
+ $this->clickLink(t('Check manually'));
$this->assertText(t('Checked available update data for one project.'));
+ $this->drupalGet('admin/modules');
$this->assertNoText(t('There are updates available for your version of Drupal.'));
$this->assertText(t('There is a security update available for your version of Drupal.'));