diff options
author | Gleb Mazovetskiy <glex.spb@gmail.com> | 2015-08-31 04:25:05 +0300 |
---|---|---|
committer | Gleb Mazovetskiy <glex.spb@gmail.com> | 2015-08-31 04:37:24 +0300 |
commit | d16ea456cb68f9cd0ce5fd623932f72c465d7bf3 (patch) | |
tree | 88368f3f7213096cfeb1f0fdfa5b279c7914ac2e /test | |
parent | 5e44c6edd7f23c94da95b00a723004b5053a8cdb (diff) |
Update and fix `rake dummy_rails`
* Fix the task
* Rename to `rake rails_server`
* Add tether as a development dependency
Diffstat (limited to 'test')
-rw-r--r-- | test/dummy_rails/app/assets/javascripts/application.js | 5 | ||||
-rw-r--r-- | test/dummy_rails/app/views/pages/root.html.slim | 7 | ||||
-rw-r--r-- | test/dummy_rails/config/application.rb | 6 | ||||
-rw-r--r-- | test/test_helper.rb | 14 |
4 files changed, 20 insertions, 12 deletions
diff --git a/test/dummy_rails/app/assets/javascripts/application.js b/test/dummy_rails/app/assets/javascripts/application.js index 8021374..e6da97e 100644 --- a/test/dummy_rails/app/assets/javascripts/application.js +++ b/test/dummy_rails/app/assets/javascripts/application.js @@ -1,2 +1,7 @@ //= require jquery +//= require tether //= require bootstrap-sprockets + +jQuery(function ($) { + $('[data-toggle="tooltip"]').tooltip() +}); diff --git a/test/dummy_rails/app/views/pages/root.html.slim b/test/dummy_rails/app/views/pages/root.html.slim index 7a9dc59..903f0af 100644 --- a/test/dummy_rails/app/views/pages/root.html.slim +++ b/test/dummy_rails/app/views/pages/root.html.slim @@ -43,10 +43,11 @@ .col-sm-6 h2 6 columns .row - .col-xs-4.col-xs-push-4 - h6 This is col-xs-4 col-xs-push-4 + .col-xs-4.col-xs-push-4: .card: .card-block + .card-text data-toggle="tooltip" title="hi" + h6 This is col-xs-4 col-xs-push-4.<br><small>Hover for tooltip.</small> - form.form-inline + .card: .card-block: form.form-inline .form-group label.sr-only for="exampleInputEmail2" Email address input.form-control#exampleInputEmail2 type="email" placeholder="Enter email" diff --git a/test/dummy_rails/config/application.rb b/test/dummy_rails/config/application.rb index 8efdd98..6151f6d 100644 --- a/test/dummy_rails/config/application.rb +++ b/test/dummy_rails/config/application.rb @@ -10,12 +10,14 @@ require 'rails' require "#{framework}/railtie" end -require 'bootstrap' require 'compass' -require 'jquery-rails' require 'slim-rails' require 'uglifier' +require 'bootstrap' +require 'jquery-rails' +require 'rails-assets-tether' + module Dummy class Application < Rails::Application config.assets.enabled = true if config.assets.respond_to?(:enabled) diff --git a/test/test_helper.rb b/test/test_helper.rb index c1c1e9a..ca7bcfb 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -20,16 +20,16 @@ Capybara.register_driver :poltergeist do |app| app, # inspector: '/Applications/Chromium.app/Contents/MacOS/Chromium', # open in inspector: page.driver.debug window_size: [1280, 1024], - timeout: 90, - js_errors: true + timeout: 90, + js_errors: true ) end Capybara.configure do |config| - config.app_host = 'http://localhost:7000' - config.default_driver = :poltergeist - config.javascript_driver = :poltergeist - config.server_port = 7000 - config.default_wait_time = 10 + config.app_host = 'http://localhost:7000' + config.default_driver = :poltergeist + config.javascript_driver = :poltergeist + config.server_port = 7000 + config.default_max_wait_time = 10 end |