Fix tests for RC1.

dereuromark · Jan 11, 2015 · afe0d96 · afe0d96
1 parent 9529417
commit afe0d96
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/Geocode/Geocode.php b/src/Geocode/Geocode.php
@@ -1,7 +1,7 @@
 <?php
 namespace Geo\Geocode;
 
-use Cake\Utility\String;
+use Cake\Utility\Text;
 use Cake\Core\Configure;
 use Cake\Network\Http\Client;
 use Cake\Log\Log;
@@ -184,7 +184,7 @@ protected function _url() {
 		$params = array(
 			'host' => $this->options['host']
 		);
-		$url = String::insert(static::BASE_URL, $params, array('before' => '{', 'after' => '}', 'clean' => true));
+		$url = Text::insert(static::BASE_URL, $params, array('before' => '{', 'after' => '}', 'clean' => true));
 		return $url;
 	}
 

diff --git a/src/Model/Behavior/GeocoderBehavior.php b/src/Model/Behavior/GeocoderBehavior.php
@@ -30,7 +30,7 @@ class GeocoderBehavior extends Behavior {
 		'require' => false, 'allowEmpty' => true, 'invalidate' => array(), 'expect' => array(),
 		'lat' => 'lat', 'lng' => 'lng', 'formatted_address' => 'formatted_address',
 		'host' => null, 'language' => 'de', 'region' => '', 'bounds' => '',
-		'overwrite' => false, 'update' => array(), 'before' => 'save',
+		'overwrite' => false, 'update' => array(), 'on' => 'beforeSave',
 		'min_accuracy' => Geocode::ACC_COUNTRY, 'allow_inconclusive' => true, 'unit' => Geocode::UNIT_KM,
 		'log' => true, // log successfull results to geocode.log (errors will be logged to error.log in either case)
 		'implementedFinders' => [
@@ -84,8 +84,8 @@ public function __construct(Table $table, array $config = []) {
  * @param \ArrayObject $options the options passed to the save method
  * @return void
  */
-	public function beforeValidate(Event $event, Entity $entity, ArrayObject $options) {
-		if ($this->_config['before'] === 'validate') {
+	public function beforeRules(Event $event, Entity $entity, ArrayObject $options) {
+		if ($this->_config['on'] === 'beforeRules') {
 			if(!$this->geocode($entity)) {
 				$event->stopPropagation();
 			}
@@ -99,7 +99,7 @@ public function beforeValidate(Event $event, Entity $entity, ArrayObject $option
  * @return void
  */
 	public function beforeSave(Event $event, Entity $entity, ArrayObject $options) {
-		if ($this->_config['before'] === 'save') {
+		if ($this->_config['on'] === 'beforeSave') {
 			if (!$this->geocode($entity)) {
 				$event->stopPropagation();
 			}

diff --git a/tests/TestCase/Geocode/GeocodeTest.php b/tests/TestCase/Geocode/GeocodeTest.php
@@ -212,8 +212,8 @@ public function testBlur() {
 		foreach ($coords as $coord) {
 			$is = $this->Geocode->blur($coord[0], $coord[1]);
 			//pr('is: '.$is.' - expected: '.$coord[0].' +- '.$coord[2]);
-			$this->assertWithinMargin($is, $coord[0], $coord[2]);
-			$this->assertNotWithinMargin($is, $coord[0], $coord[2] / 4);
+			$this->assertWithinRange($is, $coord[0], $coord[2]);
+			$this->assertNotWithinRange($is, $coord[0], $coord[2] / 4);
 		}
 	}