diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-07-30 16:19:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-30 16:19:43 +0200 |
| commit | 090eaa7e1b42143ffdb42409aa5d429cbeb3e55d (patch) | |
| tree | 32032062169eb73fe7086b0f52993b8a85a3013e /actionview | |
| parent | f757c1f413e131f4fb68e967be8fa5e2d47084ff (diff) | |
| parent | 05bbfc5eabe426fe6098c9e393a7254813831185 (diff) | |
| download | rails-090eaa7e1b42143ffdb42409aa5d429cbeb3e55d.tar.gz rails-090eaa7e1b42143ffdb42409aa5d429cbeb3e55d.tar.bz2 rails-090eaa7e1b42143ffdb42409aa5d429cbeb3e55d.zip | |
Merge pull request #30001 from y-yagi/fix_test_directory
Fix test directory to correct path
Diffstat (limited to 'actionview')
| -rw-r--r-- | actionview/package.json | 2 | ||||
| -rw-r--r-- | actionview/test/ujs/public/test/data-confirm.js | 2 | ||||
| -rw-r--r-- | actionview/test/ujs/public/test/data-remote.js | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/actionview/package.json b/actionview/package.json index 85f4ddacbe..4cbf0207e5 100644 --- a/actionview/package.json +++ b/actionview/package.json @@ -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", diff --git a/actionview/test/ujs/public/test/data-confirm.js b/actionview/test/ujs/public/test/data-confirm.js index 229b9e1466..d1ea82ea7e 100644 --- a/actionview/test/ujs/public/test/data-confirm.js +++ b/actionview/test/ujs/public/test/data-confirm.js @@ -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') }) diff --git a/actionview/test/ujs/public/test/data-remote.js b/actionview/test/ujs/public/test/data-remote.js index 161a92ac11..9bbefc18f2 100644 --- a/actionview/test/ujs/public/test/data-remote.js +++ b/actionview/test/ujs/public/test/data-remote.js @@ -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) { |