Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/199181
Change subject: Merge branch 'contrib'
......................................................................
Merge branch 'contrib'
Upgrade to Drupal 7.35 upstream
Change-Id: I24ae6c2650b31c2b3904c3e693311c2369ebe2f2
---
M modules/system/system.test
1 file changed, 4 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/drupal
refs/changes/81/199181/1
diff --git a/modules/system/system.test b/modules/system/system.test
index 4ab6199..ce92e1f 100644
--- a/modules/system/system.test
+++ b/modules/system/system.test
@@ -2827,7 +2827,6 @@
}
/**
-<<<<<<< HEAD (4bc9a7 Merge contrib to master)
* Test registry autoloader
*/
class AutoloadTest extends DrupalWebTestCase {
@@ -2846,19 +2845,14 @@
function testNamespacedClass() {
$this->assertTrue(class_exists('foo\bar\NamespacedClass'), 'Namespaced
class can be autoloaded.');
-=======
+ }
+}
+
+/**
* Tests confirm form destinations.
*/
class ConfirmFormTest extends DrupalWebTestCase {
protected $admin_user;
-
- public static function getInfo() {
- return array(
- 'name' => 'Confirm form',
- 'description' => 'Tests that the confirm form does not use external
destinations.',
- 'group' => 'System',
- );
- }
function setUp() {
parent::setUp();
@@ -2886,6 +2880,5 @@
$links = $this->xpath('//a[normalize-space(text())=:label and
@href=:url]', array(':label' => t('Cancel'), ':url' => $url));
$message = ($message ? $message : format_string('Cancel link with url %url
found.', array('%url' => $url)));
return $this->assertTrue(isset($links[0]), $message, $group);
->>>>>>> BRANCH (870c48 Upgrade to Drupal 7.35 upstream)
}
}
--
To view, visit https://gerrit.wikimedia.org/r/199181
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I24ae6c2650b31c2b3904c3e693311c2369ebe2f2
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/drupal
Gerrit-Branch: master
Gerrit-Owner: Ejegg <eeggles...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
