Permalink
Browse files

Merge branch 'release/0.4.13'

  • Loading branch information...
jeffkreeftmeijer committed Oct 10, 2011
2 parents f692462 + 9ae2e43 commit c4febe649cfa7be23c66ba8bb6ee63b5fcd5c682
View
@@ -21,7 +21,7 @@ gem 'mongoid_slug', :require => 'mongoid/slug'
gem 'omniauth'
-gem 'gravtastic', :git => 'git://github.com/jeffkreeftmeijer/gravtastic.git'
+gem 'gravtastic', :git => 'https://github.com/jeffkreeftmeijer/gravtastic.git'
gem 'wufoo'
gem 'gust'
@@ -30,12 +30,12 @@ gem 'rpm_contrib'
gem 'hoptoad_notifier'
gem 'hashr'
-gem 'arnold', :git => 'git://github.com/codebrawl/arnold.git', :branch => 'develop'
+gem 'arnold', :git => 'https://github.com/codebrawl/arnold.git', :branch => 'develop'
group :test do
gem 'rspec-rails'
gem 'shoulda-matchers'
- gem 'capybara', :git => 'git://github.com/jnicklas/capybara.git', :ref => '549e6733'
+ gem 'capybara', :git => 'https://github.com/jnicklas/capybara.git', :ref => '549e6733'
gem 'launchy'
gem 'mocha'
View
@@ -1,18 +1,18 @@
GIT
- remote: git://github.com/codebrawl/arnold.git
- revision: 66c5dae2dd51183816114e9e7b584657c222f022
+ remote: https://github.com/codebrawl/arnold.git
+ revision: e8cb6737b810454b0092d7410643ab3f5ea5f4ac
branch: develop
specs:
arnold (0.0)
GIT
- remote: git://github.com/jeffkreeftmeijer/gravtastic.git
+ remote: https://github.com/jeffkreeftmeijer/gravtastic.git
revision: 7b1a678698a0a35aeef3abd1fb8f26501e4e8b68
specs:
gravtastic (2.1.3)
GIT
- remote: git://github.com/jnicklas/capybara.git
+ remote: https://github.com/jnicklas/capybara.git
revision: 549e67336c712a1ef2119ce5ff64dbbc7542480f
ref: 549e6733
specs:
@@ -64,7 +64,7 @@ GEM
bson (1.3.1)
bson_ext (1.3.1)
builder (3.0.0)
- childprocess (0.1.9)
+ childprocess (0.2.2)
ffi (~> 1.0.6)
chunky_png (1.2.4)
coffee-script (2.2.0)
@@ -114,7 +114,7 @@ GEM
railties (~> 3.0)
thor (~> 0.14)
json (1.5.1)
- json_pure (1.5.1)
+ json_pure (1.6.1)
kramdown (0.13.3)
launchy (0.4.0)
configuration (>= 0.0.5)
@@ -248,8 +248,8 @@ GEM
sass (>= 3.1.4)
sprockets (~> 2.0.0)
tilt (~> 1.3.2)
- selenium-webdriver (0.2.0)
- childprocess (>= 0.1.7)
+ selenium-webdriver (2.8.0)
+ childprocess (>= 0.2.1)
ffi (>= 1.0.7)
json_pure
rubyzip
@@ -8,8 +8,8 @@ def avatar_url
def link_to_profile(user)
link_text = image_tag(user.gravatar_url(:size => 20, :default => avatar_url), :class => 'gravatar')
- link_text << " " << user.login
- link_to link_text, user_path(user), :name => user.login
+ link_text << " " << user.name
+ link_to link_text, user_path(user), :name => user.name
end
def clean_url(url)
@@ -6,6 +6,7 @@ def validate(document)
gist = Gist.fetch(document.gist_id)
return document.errors[:gist_id] << "does not exist" unless gist.code == 200
return document.errors[:gist_id] << "can't be anonymous" unless gist['user']
+ return document.errors[:gist_id] << "can't be public" if gist['public']
document.errors[:gist_id] << "is not yours" unless document.user.github_id == gist['user']['id']
end
@@ -5,7 +5,7 @@
%h1= @contest.name
%footer#submitter
Submitted by
- =link_to @contest.user.login, @contest.user
+ =link_to_profile @contest.user
= raw Kramdown::Document.new(@contest.description).to_html
@@ -77,7 +77,7 @@
:description => 'Write an [RSpec](http://relishapp.com/rspec) extension that solves a problem you are having.',
:starting_on => Date.yesterday.to_time,
:entries => [ Fabricate(:entry_with_files), @entry ],
- :user => Fabricate(:user, :login => 'bob')
+ :user => Fabricate(:user, :login => 'bob', :name => 'Bob')
)
end
end
@@ -88,9 +88,9 @@
end
scenario 'see the contest submitter' do
- page.should have_content 'Submitted by bob'
- page.should have_link 'bob'
+ page.should have_link 'Bob'
body.should include 'href="/users/bob"'
+ body.should include 'avatar/1dae832a3c5ae2702f34ed50a40010e8.png'
end
scenario 'read the markdown contest description' do
@@ -5,7 +5,7 @@
scenario 'log in via Github' do
visit '/'
click_link 'log in via Github'
- page.should have_content 'charlie'
+ page.should have_content 'Charlie'
end
scenario 'fail to log in using invalid credentials' do
@@ -3,8 +3,8 @@
request: !ruby/struct:VCR::Request
method: :get
uri: https://api.github.com:443/gists/1193213
- body: !!null
- headers: !!null
+ body: !!null
+ headers: !!null
response: !ruby/struct:VCR::Response
status: !ruby/struct:VCR::ResponseStatus
code: 200
@@ -24,5 +24,5 @@
- '4993'
content-length:
- '788'
- body: ! '{"description":"","html_url":"https://gist.github.com/1193213","git_pull_url":"git://gist.github.com/1193213.git","forks":[],"user":null,"git_push_url":"git@gist.github.com:1193213.git","updated_at":"2011-09-04T17:48:03Z","public":true,"files":{"gistfile1.txt":{"filename":"gistfile1.txt","raw_url":"https://gist.github.com/raw/1193213/30d74d258442c7c65512eafab474568dd706c430/gistfile1.txt","content":"test","size":4}},"comments":0,"url":"https://api.github.com/gists/1193213","history":[{"version":"29accdac7783c23db83c79ac4439f2fe9d22f2bf","user":null,"url":"https://api.github.com/gists/1193213/29accdac7783c23db83c79ac4439f2fe9d22f2bf","change_status":{"deletions":0,"additions":1,"total":1},"committed_at":"2011-09-04T17:48:03Z"}],"created_at":"2011-09-04T17:48:03Z","id":"1193213"}'
+ body: ! '{"description":"","html_url":"https://gist.github.com/1193213","git_pull_url":"git://gist.github.com/1193213.git","forks":[],"user":null,"git_push_url":"git@gist.github.com:1193213.git","updated_at":"2011-09-04T17:48:03Z","public":false,"files":{"gistfile1.txt":{"filename":"gistfile1.txt","raw_url":"https://gist.github.com/raw/1193213/30d74d258442c7c65512eafab474568dd706c430/gistfile1.txt","content":"test","size":4}},"comments":0,"url":"https://api.github.com/gists/1193213","history":[{"version":"29accdac7783c23db83c79ac4439f2fe9d22f2bf","user":null,"url":"https://api.github.com/gists/1193213/29accdac7783c23db83c79ac4439f2fe9d22f2bf","change_status":{"deletions":0,"additions":1,"total":1},"committed_at":"2011-09-04T17:48:03Z"}],"created_at":"2011-09-04T17:48:03Z","id":"1193213"}'
http_version: '1.1'
Oops, something went wrong.

0 comments on commit c4febe6

Please sign in to comment.