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.

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

Refreshed Gemfile.lock file #244

Merged
merged 2 commits into from
Mar 19, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
source 'http://rubygems.org'
source 'https://rubygems.org'
ruby "2.0.0"

gem 'rails', '3.2.12'
Expand Down Expand Up @@ -55,12 +55,16 @@ group :development, :test do
end

group :test do
gem "capybara", '1.1.4'
gem "capybara"
gem 'capybara-webkit'
gem 'launchy'

gem 'database_cleaner'
gem 'shoulda-matchers'
gem 'webmock', :require => false
gem 'poltergeist'
gem 'timecop'
gem 'minitest', '3.5.0'
end

group :production do
Expand Down
55 changes: 31 additions & 24 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GEM
remote: http://rubygems.org/
remote: https://rubygems.org/
specs:
actionmailer (3.2.12)
actionpack (= 3.2.12)
Expand Down Expand Up @@ -30,19 +30,22 @@ GEM
multi_json (~> 1.0)
addressable (2.3.3)
arel (3.0.2)
bourne (1.1.2)
mocha (= 0.10.5)
bourne (1.2.1)
mocha (= 0.12.7)
bugsnag (1.2.18)
httparty (>= 0.6, < 1.0)
multi_json (~> 1.0)
builder (3.0.4)
capybara (1.1.4)
capybara (2.0.2)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
xpath (~> 1.0.0)
capybara-webkit (0.14.2)
capybara (~> 2.0, >= 2.0.2)
json
chai-jquery-rails (1.1.1)
railties (~> 3.1)
sprockets
Expand Down Expand Up @@ -90,7 +93,7 @@ GEM
pry (>= 0.9.10)
terminal-table (>= 1.4.3)
thor (>= 0.14.6)
guard-rspec (2.5.0)
guard-rspec (2.5.1)
guard (>= 1.1)
rspec (~> 2.11)
guard-spork (1.5.0)
Expand All @@ -117,18 +120,20 @@ GEM
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.7.7)
jwt (0.1.7)
jwt (0.1.8)
multi_json (>= 1.5)
kaminari (0.14.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
kgio (2.8.0)
konacha (2.5.0)
konacha (2.5.1)
actionpack (>= 3.1, < 5)
capybara
colorize
railties (>= 3.1, < 5)
sprockets
launchy (2.2.0)
addressable (~> 2.3)
less (2.3.1)
commonjs (~> 0.2.6)
less-rails (2.3.2)
Expand All @@ -145,9 +150,10 @@ GEM
metaclass (0.0.1)
method_source (0.8.1)
mime-types (1.21)
mocha (0.10.5)
minitest (3.5.0)
mocha (0.12.7)
metaclass (~> 0.0.1)
multi_json (1.6.1)
multi_json (1.7.0)
multi_xml (0.5.3)
multipart-post (1.2.0)
netrc (0.7.7)
Expand Down Expand Up @@ -183,12 +189,10 @@ GEM
multi_json (~> 1.3)
omniauth-oauth (~> 1.0)
pg (0.14.1)
poltergeist (1.0.2)
capybara (~> 1.1)
childprocess (~> 0.3)
poltergeist (1.1.0)
capybara (~> 2.0, >= 2.0.1)
faye-websocket (~> 0.4, >= 0.4.4)
http_parser.rb (~> 0.5.3)
multi_json (~> 1.0)
polyglot (0.3.3)
pry (0.9.12)
coderay (~> 1.0.5)
Expand Down Expand Up @@ -230,7 +234,7 @@ GEM
rspec-core (~> 2.13.0)
rspec-expectations (~> 2.13.0)
rspec-mocks (~> 2.13.0)
rspec-core (2.13.0)
rspec-core (2.13.1)
rspec-expectations (2.13.0)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.13.0)
Expand All @@ -253,9 +257,9 @@ GEM
multi_json (~> 1.0)
rubyzip
websocket (~> 1.0.4)
shoulda-matchers (1.4.2)
shoulda-matchers (1.5.0)
activesupport (>= 3.0.0)
bourne (~> 1.1.2)
bourne (~> 1.2.0)
simple_form (2.1.0)
actionpack (~> 3.0)
activemodel (~> 3.0)
Expand All @@ -268,7 +272,7 @@ GEM
railties (>= 3.1)
sinon-rails (1.4.2.1)
railties (>= 3.1)
slop (3.4.3)
slop (3.4.4)
spork (0.9.2)
sprockets (2.2.2)
hike (~> 1.2)
Expand All @@ -283,20 +287,20 @@ GEM
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.17.0)
tilt (1.3.4)
timecop (0.6.0)
tilt (1.3.5)
timecop (0.6.1)
treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
twitter (4.6.0)
twitter (4.6.1)
faraday (~> 0.8, < 0.10)
multi_json (~> 1.0)
simple_oauth (~> 0.2)
twitter-bootstrap-rails (2.2.4)
actionpack (>= 3.1)
execjs
railties (>= 3.1)
tzinfo (0.3.36)
tzinfo (0.3.37)
uglifier (1.3.0)
execjs (>= 0.3.0)
multi_json (~> 1.0, >= 1.0.2)
Expand All @@ -308,15 +312,16 @@ GEM
addressable (>= 2.2.7)
crack (>= 0.3.2)
websocket (1.0.7)
xpath (0.1.4)
xpath (1.0.0)
nokogiri (~> 1.3)

PLATFORMS
ruby

DEPENDENCIES
bugsnag
capybara (= 1.1.4)
capybara
capybara-webkit
chai-jquery-rails
coffee-rails (~> 3.2.1)
dalli
Expand All @@ -331,8 +336,10 @@ DEPENDENCIES
jquery-rails (= 2.1.4)
kaminari
konacha
launchy
less-rails
memcachier
minitest (= 3.5.0)
newrelic_rpm
octokit
omniauth
Expand Down
4 changes: 2 additions & 2 deletions spec/requests/projects_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@

it 'should show both projects by default' do
within '#projects' do
page.should have_content 'Ruby project'
page.should have_content 'Java project'
page.should have_selector('h4', text: /Java project/i)
page.should have_selector('h4', text: /Ruby project/i)
end
end

Expand Down
5 changes: 4 additions & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@

WebMock.disable_net_connect! :allow_localhost => true

# To run specs headless, use :webkit driver:
Capybara.javascript_driver = :webkit
if ENV['POLTERGEIST']
require 'capybara/poltergeist'
Capybara.javascript_driver = :poltergeist
Expand Down Expand Up @@ -75,6 +77,7 @@
config.infer_base_class_for_anonymous_controllers = false

config.include FactoryGirl::Syntax::Methods
config.include Capybara::DSL
end
end

Expand All @@ -85,7 +88,7 @@
config.before do
User.any_instance.stub(:estimate_skills).and_return(nil)
Twitter::Client.any_instance.stub(:update)
Timecop.freeze(Date.parse('12/12/2012'))
Timecop.travel(Date.parse('12/12/2012'))
end

config.after do
Expand Down