Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Bump ruby to 1.9.2-p180

  • Loading branch information...
commit bde0f6089b2d45cf2700d5ade56458a50aff8957 1 parent 1ee9cdb
@veezus authored
View
2  .rvmrc
@@ -1,2 +1,2 @@
rvm_gemset_create_on_use_flag=1
-rvm 1.8.7-p249@vurl
+rvm 1.9.2-p180@vurl
View
6 Gemfile
@@ -17,16 +17,16 @@ group :development do
gem "capistrano", "2.5.19"
gem "eycap", "0.5.9"
gem "launchy"
- gem "mongrel"
- gem "ruby-debug"
+ gem "ruby-debug19"
end
group :test do
gem "akephalos", "0.2.2"
gem "capybara", "0.3.8"
- gem "fabrication", "0.6.0"
+ gem "fabrication", "0.9.5"
gem "rspec-rails", "1.3.2"
gem "shoulda", "2.10.3"
+ gem "test-unit", "1.2.3"
gem "unencumbered"
gem "watchr"
end
View
40 Gemfile.lock
@@ -14,6 +14,7 @@ GEM
akephalos (0.2.2)
capybara (~> 0.3.8)
jruby-jars
+ archive-tar-minitar (0.5.2)
authlogic (2.1.5)
activesupport
capistrano (2.5.19)
@@ -29,25 +30,23 @@ GEM
rack (>= 1.0.0)
rack-test (>= 0.5.2)
selenium-webdriver (>= 0.0.3)
- cgi_multipart_eof_fix (2.5.0)
childprocess (0.1.4)
ffi (~> 0.6.3)
columnize (0.3.2)
configuration (1.2.0)
crack (0.1.8)
culerity (0.2.12)
- daemons (1.1.0)
decent_exposure (0.2.3)
eycap (0.5.9)
capistrano (>= 2.2.0)
- fabrication (0.6.0)
- fastthread (1.0.7)
+ fabrication (0.9.5)
ffi (0.6.3)
rake (>= 0.8.7)
- gem_plugin (0.2.3)
haml (3.0.6)
hashie (0.4.0)
highline (1.6.1)
+ hoe (2.9.4)
+ rake (>= 0.8.7)
httparty (0.6.1)
crack (= 0.1.8)
jruby-jars (1.5.5)
@@ -56,13 +55,9 @@ GEM
launchy (0.3.7)
configuration (>= 0.0.5)
rake (>= 0.8.1)
- linecache (0.43)
+ linecache19 (0.5.12)
+ ruby_core_source (>= 0.1.4)
mime-types (1.16)
- mongrel (1.1.5)
- cgi_multipart_eof_fix (>= 2.4)
- daemons (>= 1.0.3)
- fastthread (>= 1.0.1)
- gem_plugin (>= 0.2.3)
multi_json (0.0.5)
mysql (2.8.1)
net-scp (1.0.4)
@@ -101,11 +96,16 @@ GEM
rspec-rails (1.3.2)
rack (>= 1.0.0)
rspec (>= 1.3.0)
- ruby-debug (0.10.4)
- columnize (>= 0.1)
- ruby-debug-base (~> 0.10.4.0)
- ruby-debug-base (0.10.4)
- linecache (>= 0.3)
+ ruby-debug-base19 (0.11.25)
+ columnize (>= 0.3.1)
+ linecache19 (>= 0.5.11)
+ ruby_core_source (>= 0.1.4)
+ ruby-debug19 (0.11.6)
+ columnize (>= 0.3.1)
+ linecache19 (>= 0.5.11)
+ ruby-debug-base19 (>= 0.11.19)
+ ruby_core_source (0.1.5)
+ archive-tar-minitar (>= 0.5.2)
rubyzip (0.9.4)
selenium-webdriver (0.1.0)
childprocess (= 0.1.4)
@@ -117,6 +117,8 @@ GEM
rack (>= 1.0)
sitemap_generator (0.2.2)
state_machine (0.9.3)
+ test-unit (1.2.3)
+ hoe (>= 1.5.1)
twitter (0.9.12)
hashie (~> 0.4.0)
httparty (~> 0.6.1)
@@ -137,20 +139,20 @@ DEPENDENCIES
capybara (= 0.3.8)
decent_exposure (= 0.2.3)
eycap (= 0.5.9)
- fabrication (= 0.6.0)
+ fabrication (= 0.9.5)
haml (= 3.0.6)
launchy
- mongrel
mysql
newrelic_rpm (= 2.9.8)
paperclip (= 2.3.3)
rails (= 2.3.5)
resque (= 1.9.7)
rspec-rails (= 1.3.2)
- ruby-debug
+ ruby-debug19
shoulda (= 2.10.3)
sitemap_generator (= 0.2.2)
state_machine (= 0.9.3)
+ test-unit (= 1.2.3)
twitter (= 0.9.12)
unencumbered
watchr
View
2  lib/tasks/rspec.rake
@@ -162,4 +162,4 @@ namespace :spec do
end
end
-end
+end
View
2  spec/integration/api_call_spec.rb
@@ -34,7 +34,7 @@
it "returns a string with the errors for an html request" do
visit shorten_path(:url => 'whatthe?')
- page.body.should == 'Url is invalid'
+ page.body.should include('Url is invalid')
end
end
View
8 spec/integration/user_claims_account_spec.rb
@@ -34,10 +34,10 @@
page.should have_content("Successfully saved your changes")
end
And "I should see my values updated" do
- page.should have_css("input#user_name[type=text]", 'Veezus Kreist')
- page.should have_css("input#user_email[type=text]", new_email)
- page.should have_css("input#user_website[type=text]", 'some spam nonsense')
- page.should have_css("input#user_blog[type=text]", 'an offer to buy viagra')
+ page.find(:css, "input#user_name").value.should == 'Veezus Kreist'
+ page.find(:css, "input#user_email").value.should == new_email
+ page.find(:css, "input#user_website").value.should == 'http://veez.us'
+ page.find(:css, "input#user_blog").value.should == 'http://blog.veez.us'
end
end
end
View
2  spec/integration/user_clicks_vurl_spec.rb
@@ -15,7 +15,7 @@
page.should have_content("spam and/or malware")
end
And "I should see a link to the original URL" do
- page.should have_css("a[href='http://example.com']", "http://example.com")
+ page.find(:css, "a[href='http://example.com']").text.should == "http://example.com"
end
end
end
View
2  spec/integration/user_logs_in_spec.rb
@@ -25,7 +25,7 @@
When "I follow My Account" do
executes { click_link "My Account" }
Then "I should see my correct details" do
- page.should have_css("input#user_email[type=text]", user.email)
+ page.find(:css, "input#user_email").value.should == user.email
end
end
end
View
3  spec/models/vurl_spec.rb
@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+# encoding: utf-8
+require 'spec_helper'
describe "Vurl" do
View
1  spec/spec_helper.rb
@@ -4,7 +4,6 @@
require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)
require 'spec/autorun'
require 'spec/rails'
-require 'spec/support/integration'
require 'capybara/rails'
require 'capybara/dsl'
View
9 test/fixtures/vurls.yml
@@ -1,9 +0,0 @@
-# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
-
-one:
- url: MyString
- slug: MyString
-
-two:
- url: MyString
- slug: MyString
View
9 test/performance/browsing_test.rb
@@ -1,9 +0,0 @@
-require 'test_helper'
-require 'performance_test_help'
-
-# Profiling results for each test method are written to tmp/performance.
-class BrowsingTest < ActionController::PerformanceTest
- def test_homepage
- get '/'
- end
-end
View
38 test/test_helper.rb
@@ -1,38 +0,0 @@
-ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'test_help'
-
-class ActiveSupport::TestCase
- # Transactional fixtures accelerate your tests by wrapping each test method
- # in a transaction that's rolled back on completion. This ensures that the
- # test database remains unchanged so your fixtures don't have to be reloaded
- # between every test method. Fewer database queries means faster tests.
- #
- # Read Mike Clark's excellent walkthrough at
- # http://clarkware.com/cgi/blosxom/2005/10/24#Rails10FastTesting
- #
- # Every Active Record database supports transactions except MyISAM tables
- # in MySQL. Turn off transactional fixtures in this case; however, if you
- # don't care one way or the other, switching from MyISAM to InnoDB tables
- # is recommended.
- #
- # The only drawback to using transactional fixtures is when you actually
- # need to test transactions. Since your test is bracketed by a transaction,
- # any transactions started in your code will be automatically rolled back.
- self.use_transactional_fixtures = true
-
- # Instantiated fixtures are slow, but give you @david where otherwise you
- # would need people(:david). If you don't want to migrate your existing
- # test cases which use the @david style and don't mind the speed hit (each
- # instantiated fixtures translates to a database query per test method),
- # then set this back to true.
- self.use_instantiated_fixtures = false
-
- # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
- #
- # Note: You'll currently still have to declare fixtures explicitly in integration tests
- # -- they do not yet inherit this setting
- fixtures :all
-
- # Add more helper methods to be used by all tests here...
-end
Please sign in to comment.
Something went wrong with that request. Please try again.