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

event display end. fix #330 #338

Merged
merged 3 commits into from
May 13, 2013
Merged

event display end. fix #330 #338

merged 3 commits into from
May 13, 2013

Conversation

jacky-zhangjb
Copy link
Contributor

看看对于任务 #330 这次的 PR 行不行。另外 CI 测试的时候。
有个错误信息。(在 RVM 2.0 中) 。但这个应该不是 我修改的代码造成的。不知是否是一个BUG
Gem::RemoteFetcher::FetchError: Errno::ETIMEDOUT: Connection timed out - connect(2) (https://rubygems.org/gems/pg-0.14.1.gem)

An error occurred while installing pg (0.14.1), and Bundler cannot continue.

test20130512

@@ -28,12 +28,19 @@

describe 'when user has signed in', js: true do
let(:event) { FactoryGirl.create(:event, :user => FactoryGirl.create(:user)) }
let(:old_event) { FactoryGirl.create(:event, :slug => "rubyconfchina2", :start_time => Time.now - 3.day, :end_time => nil, :user => FactoryGirl.create(:user)) }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Time.now - 3.day

3.day.ago

Time.now + 3.day

3.day.since

@saberma
Copy link
Member

saberma commented May 13, 2013

Travis-CI 这几天是有超时的错误,现在显示的测试结果是 pass 的了

saberma added a commit that referenced this pull request May 13, 2013
@saberma saberma merged commit 7f6526e into 19wu:master May 13, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants