Skip to content

Commit

Permalink
Update rails to 4.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
i2bskn committed Nov 4, 2013
1 parent 615ca6b commit a073ed6
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 37 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ source 'https://rubygems.org'

ruby '2.0.0'

gem 'rails', '4.0.0'
gem 'rails', '4.0.1'
gem 'pg'
gem 'sass-rails', '~> 4.0.0'
gem 'coffee-rails', '~> 4.0.0'
Expand Down
52 changes: 26 additions & 26 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
GEM
remote: https://rubygems.org/
specs:
actionmailer (4.0.0)
actionpack (= 4.0.0)
mail (~> 2.5.3)
actionpack (4.0.0)
activesupport (= 4.0.0)
actionmailer (4.0.1)
actionpack (= 4.0.1)
mail (~> 2.5.4)
actionpack (4.0.1)
activesupport (= 4.0.1)
builder (~> 3.1.0)
erubis (~> 2.7.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
activemodel (4.0.0)
activesupport (= 4.0.0)
activemodel (4.0.1)
activesupport (= 4.0.1)
builder (~> 3.1.0)
activerecord (4.0.0)
activemodel (= 4.0.0)
activerecord (4.0.1)
activemodel (= 4.0.1)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.0)
activesupport (= 4.0.1)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.3)
activesupport (4.0.0)
activesupport (4.0.1)
i18n (~> 0.6, >= 0.6.4)
minitest (~> 4.2)
multi_json (~> 1.3)
Expand All @@ -46,10 +46,10 @@ GEM
diff-lcs (1.2.4)
erubis (2.7.0)
execjs (2.0.2)
factory_girl (4.2.0)
factory_girl (4.3.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.2.1)
factory_girl (~> 4.2.0)
factory_girl_rails (4.3.0)
factory_girl (~> 4.3.0)
railties (>= 3.0.0)
faraday (0.8.8)
multipart-post (~> 1.2.0)
Expand Down Expand Up @@ -83,7 +83,7 @@ GEM
jwt (~> 0.1.4)
multi_json (~> 1.0)
rack (~> 1.2)
octokit (2.5.0)
octokit (2.5.1)
sawyer (~> 0.5.1)
omniauth (1.1.4)
hashie (>= 1.2, < 3)
Expand All @@ -105,30 +105,30 @@ GEM
rack (1.5.2)
rack-test (0.6.2)
rack (>= 1.0)
rails (4.0.0)
actionmailer (= 4.0.0)
actionpack (= 4.0.0)
activerecord (= 4.0.0)
activesupport (= 4.0.0)
rails (4.0.1)
actionmailer (= 4.0.1)
actionpack (= 4.0.1)
activerecord (= 4.0.1)
activesupport (= 4.0.1)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.0)
railties (= 4.0.1)
sprockets-rails (~> 2.0.0)
rails_12factor (0.0.2)
rails_serve_static_assets
rails_stdout_logging
rails_serve_static_assets (0.0.1)
rails_stdout_logging (0.0.3)
railties (4.0.0)
actionpack (= 4.0.0)
activesupport (= 4.0.0)
railties (4.0.1)
actionpack (= 4.0.1)
activesupport (= 4.0.1)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.1.0)
rdoc (3.12.2)
json (~> 1.4)
rest-client (1.6.7)
mime-types (>= 1.16)
rspec-core (2.14.6)
rspec-core (2.14.7)
rspec-expectations (2.14.3)
diff-lcs (>= 1.1.3, < 2.0)
rspec-mocks (2.14.4)
Expand Down Expand Up @@ -196,7 +196,7 @@ DEPENDENCIES
omniauth-github
pg
pry-rails
rails (= 4.0.0)
rails (= 4.0.1)
rails_12factor
rspec-rails
sass-rails (~> 4.0.0)
Expand Down
7 changes: 1 addition & 6 deletions config/application.rb
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
require File.expand_path('../boot', __FILE__)

# Pick the frameworks you want:
require "active_record/railtie"
require "action_controller/railtie"
require "action_mailer/railtie"
require "sprockets/railtie"
# require "rails/test_unit/railtie"
require 'rails/all'

# Require the gems listed in Gemfile, including any gems
# you've limited to :test, :development, or :production.
Expand Down
8 changes: 4 additions & 4 deletions spec/models/tag_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@
end

describe ".duplicate?" do
it "should return nil if not exists" do
it "should return false if not exists" do
g = FactoryGirl.create(:gist)
expect(Tag.duplicate?(name: "not_exists", user: g.user.id, gist: g.id)).to be_nil
expect(Tag.duplicate?(name: "not_exists", user: g.user.id, gist: g.id)).to be_false
end

it "should not return nil if exists" do
it "should return true if exists" do
t = FactoryGirl.create(:tag)
expect(Tag.duplicate?(name: t.name, user: t.user_id, gist: t.gist_id)).not_to be_nil
expect(Tag.duplicate?(name: t.name, user: t.user_id, gist: t.gist_id)).to be_true
end
end
end

0 comments on commit a073ed6

Please sign in to comment.