consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merges with master and fixes conflicts

Browse Source
This commit is contained in:
kikito
2015-10-31 17:09:52 +01:00
parent ddc8097e7d 36e3ee0c5b
commit 2fab210ac8
87 changed files with 1747 additions and 1343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spec/features/comments/debates_spec.rb
View File

@@ -100,7 +100,7 @@ feature 'Commenting debates' do
create(:comment, commentable: debate)
visit debate_path(debate)
expect(page).to have_content 'You need to sign in or sign up to comment'
expect(page).to have_content 'You must Sign in or Sign up to leave a comment'
within('#comments') do
expect(page).to_not have_content 'Write a comment'
expect(page).to_not have_content 'Reply'
@@ -233,7 +233,7 @@ feature 'Commenting debates' do
visit debate_path(debate)
within "#comment_#{comment.id}" do
expect(page).to have_content('Deleted user')
expect(page).to have_content('User deleted')
expect(page).to have_content('this should be visible')
end
end