Merge pull request #30001 from y-yagi/fix_test_directory

Fix test directory to correct path
This commit is contained in:
Kasper Timm Hansen 2017-07-30 16:19:43 +02:00 committed by GitHub
commit 090eaa7e1b
3 changed files with 3 additions and 3 deletions

@ -12,7 +12,7 @@
"scripts": {
"build": "bundle exec blade build",
"test": "echo \"See the README: https://github.com/rails/rails/blob/master/actionview/app/assets/javascripts#how-to-run-tests\" && exit 1",
"lint": "coffeelint app/assets/javascripts && eslint test/public/test"
"lint": "coffeelint app/assets/javascripts && eslint test/ujs/public/test"
},
"repository": {
"type": "git",

@ -300,7 +300,7 @@ asyncTest('clicking on the children of a disabled button should not trigger a co
window.confirm = function(msg) { message = msg; return false }
$('button[data-confirm][disabled]')
.html("<strong>Click me</strong>")
.html('<strong>Click me</strong>')
.bindNative('confirm', function() {
App.assertCallbackNotInvoked('confirm')
})

@ -411,7 +411,7 @@ asyncTest('form buttons should only be serialized when clicked', 4, function() {
asyncTest('changing a select option without "data-url" attribute still fires ajax request to current location', 1, function() {
var currentLocation, ajaxLocation
buildSelect({'data-url': ''});
buildSelect({'data-url': ''})
$('select[data-remote]')
.bindNative('ajax:beforeSend', function(e, xhr, settings) {