Cleanup after #14017 (#14091)

yiisoft · May 1, 2017 · 33cff4b · 33cff4b
1 parent 533da62
commit 33cff4b
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 41 deletions.
diff --git a/composer.json b/composer.json
@@ -107,14 +107,6 @@
     "extra": {
         "branch-alias": {
             "dev-master": "2.0.x-dev"
-        },
-        "asset-installer-paths": {
-            "npm-asset-library": "vendor/npm",
-            "bower-asset-library": "vendor/bower"
-        },
-        "asset-vcs-driver-options": {
-            "github-no-api": true
-        },
-        "asset-pattern-skip-version": "(-build|-patch)"
+        }
     }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/tests/js/tests/yii.captcha.test.js b/tests/js/tests/yii.captcha.test.js
@@ -8,7 +8,7 @@ var vm = require('vm');
 
 describe('yii.captcha', function () {
     var yiiCaptchaPath = 'framework/assets/yii.captcha.js';
-    var jQueryPath = 'vendor/bower/jquery/dist/jquery.js';
+    var jQueryPath = 'vendor/bower-asset/jquery/dist/jquery.js';
     var $;
     var $captcha;
     var settings = {

diff --git a/tests/js/tests/yii.gridView.test.js b/tests/js/tests/yii.gridView.test.js
@@ -9,7 +9,7 @@ var vm = require('vm');
 describe('yii.gridView', function () {
     var yiiGridViewPath = 'framework/assets/yii.gridView.js';
     var yiiPath = 'framework/assets/yii.js';
-    var jQueryPath = 'vendor/bower/jquery/dist/jquery.js';
+    var jQueryPath = 'vendor/bower-asset/jquery/dist/jquery.js';
     var $;
     var $gridView;
     var settings = {

diff --git a/tests/js/tests/yii.test.js b/tests/js/tests/yii.test.js
@@ -20,8 +20,8 @@ var StringUtils = {
 
 describe('yii', function () {
     var yiiPath = 'framework/assets/yii.js';
-    var jQueryPath = 'vendor/bower/jquery/dist/jquery.js';
-    var pjaxPath = 'vendor/bower/yii2-pjax/jquery.pjax.js';
+    var jQueryPath = 'vendor/bower-asset/jquery/dist/jquery.js';
+    var pjaxPath = 'vendor/bower-asset/yii2-pjax/jquery.pjax.js';
     var sandbox;
     var $;
     var yii;

diff --git a/tests/js/tests/yii.validation.test.js b/tests/js/tests/yii.validation.test.js
@@ -18,7 +18,7 @@ var StringUtils = {
 };
 
 var jsdom = require('mocha-jsdom');
-var punycode = require('../../../vendor/bower/punycode/punycode');
+var punycode = require('../../../vendor/bower-asset/punycode/punycode');
 
 var fs = require('fs');
 var vm = require('vm');
@@ -75,7 +75,7 @@ describe('yii.validation', function () {
         yii = sandbox.yii;
     }
 
-    jsdom({src: fs.readFileSync('vendor/bower/jquery/dist/jquery.js', 'utf-8')});
+    jsdom({src: fs.readFileSync('vendor/bower-asset/jquery/dist/jquery.js', 'utf-8')});
 
     before(function () {
         $ = window.$;