Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Adding capybara-webkit to the project.

Signed-off-by: Carlos León <mail@carlosleon.info>
  • Loading branch information...
commit a697df2adb9939ca8d4290ddd37442afc416b126 1 parent 2dab00e
Carlos León mongrelion authored
1  Gemfile
@@ -35,6 +35,7 @@ group :test do
35 35 gem "ZenTest"
36 36 gem "autotest-rails"
37 37 gem 'database_cleaner'
  38 + gem 'capybara-webkit'
38 39 end
39 40
40 41 group :development, :development_cached do
22 Gemfile.lock
@@ -61,6 +61,17 @@ GEM
61 61 net-sftp (>= 2.0.0)
62 62 net-ssh (>= 2.0.14)
63 63 net-ssh-gateway (>= 1.1.0)
  64 + capybara (1.1.2)
  65 + mime-types (>= 1.16)
  66 + nokogiri (>= 1.3.3)
  67 + rack (>= 1.0.0)
  68 + rack-test (>= 0.5.4)
  69 + selenium-webdriver (~> 2.0)
  70 + xpath (~> 0.1.4)
  71 + capybara-webkit (0.7.2)
  72 + capybara (>= 1.0.0, < 1.2)
  73 + childprocess (0.2.4)
  74 + ffi (~> 1.0.6)
64 75 chunky_png (1.2.5)
65 76 coderay (0.9.8)
66 77 coffee-rails (3.1.1)
@@ -85,6 +96,7 @@ GEM
85 96 railties (>= 3.0.0)
86 97 fancy-buttons (1.1.2)
87 98 compass (>= 0.11)
  99 + ffi (1.0.11)
88 100 fssm (0.2.7)
89 101 haml (3.1.4)
90 102 highline (1.6.9)
@@ -114,6 +126,7 @@ GEM
114 126 net-ssh (2.2.1)
115 127 net-ssh-gateway (1.1.0)
116 128 net-ssh (>= 1.99.1)
  129 + nokogiri (1.5.0)
117 130 open4 (1.3.0)
118 131 polyglot (0.3.3)
119 132 pry (0.9.8pre2)
@@ -162,12 +175,18 @@ GEM
162 175 rspec (~> 2.7.0)
163 176 ruby_parser (2.3.1)
164 177 sexp_processor (~> 3.0)
  178 + rubyzip (0.9.5)
165 179 sass (3.1.12)
166 180 sass-rails (3.1.5)
167 181 actionpack (~> 3.1.0)
168 182 railties (~> 3.1.0)
169 183 sass (~> 3.1.10)
170 184 tilt (~> 1.3.2)
  185 + selenium-webdriver (2.15.0)
  186 + childprocess (>= 0.2.1)
  187 + ffi (~> 1.0.9)
  188 + multi_json (~> 1.0.4)
  189 + rubyzip
171 190 sexp_processor (3.0.9)
172 191 shoulda-matchers (1.0.0)
173 192 slop (2.4.2)
@@ -188,6 +207,8 @@ GEM
188 207 multi_json (>= 1.0.2)
189 208 wice_grid (3.0.0.pre1)
190 209 will_paginate (3.0.2)
  210 + xpath (0.1.4)
  211 + nokogiri (~> 1.3)
191 212 yui-compressor (0.9.6)
192 213 POpen4 (>= 0.1.4)
193 214
@@ -202,6 +223,7 @@ DEPENDENCIES
202 223 autotest-rails
203 224 builder
204 225 capistrano
  226 + capybara-webkit
205 227 coffee-rails (~> 3.1.1)
206 228 compass
207 229 database_cleaner
4 app/views/user_sessions/new.html.haml
@@ -20,11 +20,11 @@
20 20 = f.label :password, :class => "overlabel"
21 21 = f.password_field :password, :class => "pasword overlayable", :autocapitalize => "off", :autocomplete => "on", :autocorrect => "off", :title => "password"
22 22 #signin_button
23   - %input{:src => "/images/signin/btn_sign-in.png", :type => "image"}
  23 + %input{:src => "/images/signin/btn_sign-in.png", :type => "image", :value => 'Sign In'}
24 24 %td
25 25 = link_to image_tag('/images/signin/register.png', :width => '210', :border => '0'), signup_path
26 26 .help
27 27 %ul#help_user_login
28 28 %li
29 29 %strong Help:
30   - = link_to "I can't sign in or I forgot my login/password", reset_password_path
  30 + = link_to "I can't sign in or I forgot my login/password", reset_password_path
5 spec/spec_helper.rb
@@ -12,8 +12,13 @@
12 12 # config.mock_with :rspec
13 13 config.fixture_path = "#{::Rails.root}/spec/fixtures"
14 14 config.use_transactional_fixtures = true
  15 +
  16 + # - DatabaseCleaner -
15 17 DatabaseCleaner.strategy = :truncation
16 18 DatabaseCleaner.clean
  19 +
  20 + # - Capybara -
  21 + Capybara.javascript_driver = :webkit
17 22 end
18 23
19 24

0 comments on commit a697df2

Please sign in to comment.
Something went wrong with that request. Please try again.