Commit 30c1e025 by tady

downgrade ruby version to 2.0.0

because of minitest
parent 015cbafe
language: ruby language: ruby
rvm: rvm:
- 2.1.0 - 2.0.0
source 'https://rubygems.org' source 'https://rubygems.org'
ruby '2.1.0' ruby '2.0.0'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 4.0.2' gem 'rails', '~> 4.0.2'
...@@ -45,9 +45,6 @@ end ...@@ -45,9 +45,6 @@ end
# gem 'bootstrap-sass-rails' # gem 'bootstrap-sass-rails'
# activesupport bug?
gem 'minitest', '4.7.5'
gem 'devise' gem 'devise'
gem 'omniauth-google-oauth2' gem 'omniauth-google-oauth2'
......
...@@ -267,7 +267,6 @@ DEPENDENCIES ...@@ -267,7 +267,6 @@ DEPENDENCIES
guard-spring guard-spring
jbuilder jbuilder
mail mail
minitest (= 4.7.5)
nokogiri nokogiri
omniauth-google-oauth2 omniauth-google-oauth2
premailer premailer
......
...@@ -40,7 +40,7 @@ class PostsController < ApplicationController ...@@ -40,7 +40,7 @@ class PostsController < ApplicationController
end end
def fork def fork
@post = set_post.generate_fork(user: current_user) @post = set_post.generate_fork(current_user)
render action: 'new' render action: 'new'
end end
......
...@@ -38,7 +38,7 @@ class Post < ActiveRecord::Base ...@@ -38,7 +38,7 @@ class Post < ActiveRecord::Base
end end
# generate forked post (not saved) # generate forked post (not saved)
def generate_fork(user: ) def generate_fork(user)
forked_post = self.clone forked_post = self.clone
forked_post.title = forked_post.title.gsub(/%Name/, user.name) forked_post.title = forked_post.title.gsub(/%Name/, user.name)
forked_post.title = Time.now.strftime(forked_post.title) # TODO forked_post.title = Time.now.strftime(forked_post.title) # TODO
......
...@@ -939,6 +939,6 @@ ...@@ -939,6 +939,6 @@
null null
] ]
}, },
"timestamp": 1388288955 "timestamp": 1388292345
} }
} }
...@@ -10,7 +10,7 @@ describe Post do ...@@ -10,7 +10,7 @@ describe Post do
describe 'Fork' do describe 'Fork' do
subject { @post.generate_fork(user: @alice) } subject { @post.generate_fork(@alice) }
it 'valid title' do it 'valid title' do
expect(subject.title).to eq('sample title') expect(subject.title).to eq('sample title')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment