Skip to content

Commit

Permalink
Merge branch 'master' of github.com:tdiary/tdiary-core
Browse files Browse the repository at this point in the history
  • Loading branch information
tdtds committed Nov 22, 2012
2 parents 316181c + 6aabf5c commit e333700
Show file tree
Hide file tree
Showing 22 changed files with 390 additions and 158 deletions.
32 changes: 29 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,40 @@ env:
- TEST_MODE=webrick
- TEST_MODE=secure

gemfile:
- Gemfile
- misc/gemfiles/ruby18.gemfile

notifications:
irc: "irc.freenode.org#tdiary"

matrix:
exclude:
- rvm: ree
env: TEST_MODE=rack
gemfile: Gemfile
- rvm: ree
env: TEST_MODE=rdb
gemfile: Gemfile
- rvm: 1.9.2
env: TEST_MODE=rack
gemfile: misc/gemfiles/ruby18.gemfile
- rvm: 1.9.2
env: TEST_MODE=rdb
gemfile: misc/gemfiles/ruby18.gemfile
- rvm: 1.9.3
env: TEST_MODE=rack
gemfile: misc/gemfiles/ruby18.gemfile
- rvm: 1.9.3
env: TEST_MODE=rdb
gemfile: misc/gemfiles/ruby18.gemfile
- rvm: ruby-head
env: TEST_MODE=rack
gemfile: misc/gemfiles/ruby18.gemfile
- rvm: ruby-head
env: TEST_MODE=rdb
gemfile: misc/gemfiles/ruby18.gemfile
allow_failures:
# webrick and secure mode is unstable results...
- env: TEST_MODE=webrick
- env: TEST_MODE=secure
# travis's ruby-head doesn't supported to selenium-webdriver.
- rvm: ruby-head
env: TEST_MODE=webrick
4 changes: 3 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ gem 'omniauth-github'
platforms :mri do
# To use CoffeeScript
gem 'coffee-script'
gem 'therubyracer'

# if you don't have JavaScript processor, uncomment this line.
# gem 'therubyracer'

# To use GFM style or To covert tDiary document.
gem 'redcarpet'
Expand Down
30 changes: 13 additions & 17 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GEM
remote: http://rubygems.org/
specs:
activesupport (3.2.8)
activesupport (3.2.9)
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.3.2)
Expand All @@ -13,13 +13,13 @@ GEM
net-ssh (>= 2.0.14)
net-ssh-gateway (>= 1.1.0)
capistrano_colors (0.5.5)
capybara (1.1.3)
capybara (2.0.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
xpath (~> 1.0.0)
childprocess (0.3.6)
ffi (~> 1.0, >= 1.0.6)
ci_reporter (1.7.3)
Expand Down Expand Up @@ -52,7 +52,6 @@ GEM
multi_json (>= 1.0)
launchy (2.1.2)
addressable (~> 2.3)
libv8 (3.3.10.4)
libwebsocket (0.1.5)
addressable
method_source (0.8.1)
Expand Down Expand Up @@ -86,7 +85,7 @@ GEM
omniauth-oauth2 (1.1.1)
oauth2 (~> 0.8.0)
omniauth (~> 1.0)
omniauth-twitter (0.0.13)
omniauth-twitter (0.0.14)
multi_json (~> 1.3)
omniauth-oauth (~> 1.0)
pit (0.0.6)
Expand All @@ -104,17 +103,17 @@ GEM
racksh (1.0.0)
rack (>= 1.0)
rack-test (>= 0.5)
rake (0.9.2.2)
rake (10.0.1)
rcov (1.0.0)
redcarpet (2.2.2)
rspec (2.11.0)
rspec-core (~> 2.11.0)
rspec-expectations (~> 2.11.0)
rspec-mocks (~> 2.11.0)
rspec-core (2.11.1)
rspec-expectations (2.11.3)
rspec (2.12.0)
rspec-core (~> 2.12.0)
rspec-expectations (~> 2.12.0)
rspec-mocks (~> 2.12.0)
rspec-core (2.12.0)
rspec-expectations (2.12.0)
diff-lcs (~> 1.1.3)
rspec-mocks (2.11.3)
rspec-mocks (2.12.0)
rubyzip (0.9.9)
rvm-capistrano (1.2.7)
capistrano (>= 2.0.0)
Expand All @@ -140,8 +139,6 @@ GEM
tapp (1.4.0)
thor
test-unit (2.5.2)
therubyracer (0.10.2)
libv8 (~> 3.3.10)
thin (1.5.0)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
Expand All @@ -150,7 +147,7 @@ GEM
tilt (1.3.3)
twitter-text (1.5.0)
activesupport
xpath (0.1.4)
xpath (1.0.0)
nokogiri (~> 1.3)
yajl-ruby (1.1.0)

Expand Down Expand Up @@ -185,6 +182,5 @@ DEPENDENCIES
sqlite3
tapp
test-unit
therubyracer
thin
twitter-text
28 changes: 28 additions & 0 deletions misc/gemfiles/ruby18.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
source :rubygems

gem 'rake'

gem 'rack'
gem 'sprockets'
gem 'omniauth'
gem 'omniauth-twitter'
gem 'omniauth-github'

gem 'coffee-script'
gem 'redcarpet'
gem 'twitter-text', :require => false
gem 'pygments.rb'

group :development, :test do
gem 'pry'
gem 'tapp'
gem 'test-unit', :require => 'test/unit'
gem 'rspec'
gem 'capybara', '< 2', :require => 'capybara/rspec'
gem 'launchy'
gem 'sequel', '3.40.0'
gem 'sqlite3'
gem 'rcov'
gem 'ci_reporter'
gem 'jasmine'
end
145 changes: 145 additions & 0 deletions misc/gemfiles/ruby18.gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
GEM
remote: http://rubygems.org/
specs:
activesupport (3.2.9)
i18n (~> 0.6)
multi_json (~> 1.0)
addressable (2.3.2)
builder (3.1.4)
capybara (1.1.3)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
selenium-webdriver (~> 2.0)
xpath (~> 0.1.4)
childprocess (0.3.6)
ffi (~> 1.0, >= 1.0.6)
ci_reporter (1.7.3)
builder (>= 2.1.2)
coderay (1.0.8)
coffee-script (2.2.0)
coffee-script-source
execjs
coffee-script-source (1.4.0)
diff-lcs (1.1.3)
execjs (1.4.0)
multi_json (~> 1.0)
faraday (0.8.4)
multipart-post (~> 1.1)
ffi (1.1.5)
hashie (1.2.0)
hike (1.2.1)
httpauth (0.2.0)
i18n (0.6.1)
jasmine (1.2.1)
jasmine-core (>= 1.2.0)
rack (~> 1.0)
rspec (>= 1.3.1)
selenium-webdriver (>= 0.1.3)
jasmine-core (1.2.0)
jwt (0.1.5)
multi_json (>= 1.0)
launchy (2.1.2)
addressable (~> 2.3)
libwebsocket (0.1.5)
addressable
method_source (0.8.1)
mime-types (1.19)
multi_json (1.3.7)
multipart-post (1.1.5)
nokogiri (1.5.5)
oauth (0.4.7)
oauth2 (0.8.0)
faraday (~> 0.8)
httpauth (~> 0.1)
jwt (~> 0.1.4)
multi_json (~> 1.0)
rack (~> 1.2)
omniauth (1.1.1)
hashie (~> 1.2)
rack
omniauth-github (1.0.3)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.1)
omniauth-oauth (1.0.1)
oauth
omniauth (~> 1.0)
omniauth-oauth2 (1.1.1)
oauth2 (~> 0.8.0)
omniauth (~> 1.0)
omniauth-twitter (0.0.14)
multi_json (~> 1.3)
omniauth-oauth (~> 1.0)
posix-spawn (0.3.6)
pry (0.9.10)
coderay (~> 1.0.5)
method_source (~> 0.8)
slop (~> 3.3.1)
pygments.rb (0.3.2)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.1.0)
rack (1.4.1)
rack-test (0.6.2)
rack (>= 1.0)
rake (10.0.1)
rcov (1.0.0)
redcarpet (2.2.2)
rspec (2.12.0)
rspec-core (~> 2.12.0)
rspec-expectations (~> 2.12.0)
rspec-mocks (~> 2.12.0)
rspec-core (2.12.0)
rspec-expectations (2.12.0)
diff-lcs (~> 1.1.3)
rspec-mocks (2.12.0)
rubyzip (0.9.9)
selenium-webdriver (2.26.0)
childprocess (>= 0.2.5)
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
sequel (3.40.0)
slop (3.3.3)
sprockets (2.8.1)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6)
tapp (1.4.0)
thor
test-unit (2.5.2)
thor (0.16.0)
tilt (1.3.3)
twitter-text (1.5.0)
activesupport
xpath (0.1.4)
nokogiri (~> 1.3)
yajl-ruby (1.1.0)

PLATFORMS
ruby

DEPENDENCIES
capybara (< 2)
ci_reporter
coffee-script
jasmine
launchy
omniauth
omniauth-github
omniauth-twitter
pry
pygments.rb
rack
rake
rcov
redcarpet
rspec
sequel (= 3.40.0)
sprockets
sqlite3
tapp
test-unit
twitter-text
9 changes: 5 additions & 4 deletions spec/acceptance/append_comment_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
}
page.should have_content "こんにちは!こんにちは!"
}

click_link "#{Date.today.strftime('%Y年%m月%d日')}"
today = Date.today.strftime('%Y年%m月%d日')
page.find('h2', :text => today).click_link today
within('div.day div.comment div.commentbody') {
within('div.commentator'){
t = Time.now
Expand Down Expand Up @@ -54,10 +54,11 @@
page.should have_content "こんばんは!こんばんは!"
}

click_link "#{Date.today.strftime('%Y年%m月%d日')}"
today = Date.today.strftime('%Y年%m月%d日')
page.find('h2', :text => today).click_link today
within('div.day div.comment div.commentbody') {
t = Time.now
within('span.commenttime'){ page.should have_content "%04d年%02d月%02d日" % [t.year, t.month, t.day] }
page.should have_content "%04d年%02d月%02d日" % [t.year, t.month, t.day]
page.should have_content "alpha"
page.should have_content "bravo"
page.should have_content "こんにちは!こんにちは!"
Expand Down
Loading

0 comments on commit e333700

Please sign in to comment.