From 7e6d13750498e7c7d944c9e2c037e16ffb68a3bc Mon Sep 17 00:00:00 2001 From: Hillel Coren Date: Thu, 18 Feb 2016 19:00:21 +0200 Subject: [PATCH] Fixing test payment in Travis --- .travis.yml | 2 +- app/Http/Controllers/AccountGatewayController.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ada691db9a62..8f973c811931 100644 --- a/.travis.yml +++ b/.travis.yml @@ -40,11 +40,11 @@ before_script: - mysql -u root -e 'SET @@GLOBAL.wait_timeout=28800;' # copy configuration files - cp .env.example .env - - sed -i 's/REQUIRE_HTTPS=false/NINJA_DEV=true/g' .env - cp tests/_bootstrap.php.default tests/_bootstrap.php - php artisan key:generate --no-interaction - sed -i 's/APP_ENV=production/APP_ENV=development/g' .env - sed -i 's/APP_DEBUG=false/APP_DEBUG=true/g' .env + - sed -i 's/REQUIRE_HTTPS=false/NINJA_DEV=true/g' .env # create the database and user - mysql -u root -e "create database IF NOT EXISTS ninja;" - mysql -u root -e "GRANT ALL PRIVILEGES ON ninja.* To 'ninja'@'localhost' IDENTIFIED BY 'ninja'; FLUSH PRIVILEGES;" diff --git a/app/Http/Controllers/AccountGatewayController.php b/app/Http/Controllers/AccountGatewayController.php index 1fbeaa23751b..58b831503b78 100644 --- a/app/Http/Controllers/AccountGatewayController.php +++ b/app/Http/Controllers/AccountGatewayController.php @@ -200,10 +200,10 @@ class AccountGatewayController extends BaseController if ($gatewayId == GATEWAY_DWOLLA) { $optional = array_merge($optional, ['key', 'secret']); } elseif ($gatewayId == GATEWAY_STRIPE) { - if (Utils::isNinjaDev() && Input::get('23_apiKey') == env('TEST_API_KEY')) { + if (Utils::isNinjaDev()) { // do nothing - we're unable to acceptance test with StripeJS } else { - //$rules['publishable_key'] = 'required'; + $rules['publishable_key'] = 'required'; } }