Commit da863c06 by tady

fix travis-ci

parent 05aea730
...@@ -40,7 +40,7 @@ module RV::Mailer ...@@ -40,7 +40,7 @@ module RV::Mailer
template = File.open(path).read template = File.open(path).read
html_body = template html_body = template
.sub('__POST_URL__', Settings.rendezvous.app_host + post_path(post)) .sub('__POST_URL__', Settings.rendezvous.app_host + post.decorate.show_path)
.sub('__HTML_TITLE__', h_application_format_markdown(post.title)) .sub('__HTML_TITLE__', h_application_format_markdown(post.title))
.sub('__HTML_BODY__', h_application_format_markdown(post.body)) .sub('__HTML_BODY__', h_application_format_markdown(post.body))
.sub('__RV_URL__', Settings.rendezvous.app_host + '/') .sub('__RV_URL__', Settings.rendezvous.app_host + '/')
......
class PostDecorator < Draper::Decorator
delegate_all
def show_path
h.post_path(model)
end
end
/! view:home/login
.login .login
.container.marketing .container.marketing
.row style=("margin-top: 40px") .row style=("margin-top: 40px")
......
/! view:post/index
.row .row
#sidebar.col-xs-6.col-md-4 role="navigation" #sidebar.col-xs-6.col-md-4 role="navigation"
ul.nav.nav-tabs ul.nav.nav-tabs
li.active li.active
a data-toggle="tab" href="#tab-list" List a data-toggle="tab" href="#tab-list" List
......
...@@ -3,12 +3,12 @@ Feature: アクセス制限 ...@@ -3,12 +3,12 @@ Feature: アクセス制限
Scenario: 非ログイン --> TOPページ Scenario: 非ログイン --> TOPページ
When visit '/' When visit '/'
Then response code is 200 Then response code is 200
Then response includes '<!-- view:home/login -->' Then response includes '<!--view:home/login-->'
Scenario: 非ログイン --> postsページ Scenario: 非ログイン --> postsページ
When visit '/posts' When visit '/posts'
Then response code is 200 Then response code is 200
Then response includes '<!-- view:home/login -->' Then response includes '<!--view:home/login-->'
# Scenario: 禁止ユーザーログイン --> TOPページ # Scenario: 禁止ユーザーログイン --> TOPページ
# Given login via google with 'taro@example.com' # Given login via google with 'taro@example.com'
...@@ -19,23 +19,23 @@ Feature: アクセス制限 ...@@ -19,23 +19,23 @@ Feature: アクセス制限
# Given login via google with 'taro@example.com' # Given login via google with 'taro@example.com'
# When visit '/posts' # When visit '/posts'
# Then response code is 200 # Then response code is 200
# Then response includes '<!-- view:home/login -->' # Then response includes '<!--view:home/login-->'
Scenario: ログイン --> TOPページ Scenario: ログイン --> TOPページ
Given login Given login
When visit '/' When visit '/'
Then response code is 200 Then response code is 200
Then response includes '<!-- view:post/index -->' Then response includes '<!--view:post/index-->'
Scenario: ログイン --> postsページ Scenario: ログイン --> postsページ
Given login Given login
When visit '/posts' When visit '/posts'
Then response code is 200 Then response code is 200
Then response includes '<!-- view:post/index -->' Then response includes '<!--view:post/index-->'
Scenario: ログイン --> ログアウト Scenario: ログイン --> ログアウト
Given login Given login
When logout When logout
Then response code is 200 Then response code is 200
Then response includes '<!-- view:home/login -->' Then response includes '<!--view:home/login-->'
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