Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix JS test after #14017 #14091

Merged
merged 1 commit into from
May 1, 2017
Merged

Fix JS test after #14017 #14091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
}
}
}
51 changes: 25 additions & 26 deletions composer.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tests/js/tests/yii.captcha.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion tests/js/tests/yii.gridView.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
4 changes: 2 additions & 2 deletions tests/js/tests/yii.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions tests/js/tests/yii.validation.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -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.$;
Expand Down