gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rework roles with rolify

Browse source
This commit is contained in:
Stella Rouzi 2014-07-11 18:41:35 +03:00
parent f9f840c811
commit 4af0e59ca6
40 changed files with 167 additions and 228 deletions
Download patch file Download diff file Expand all files Collapse all files

4
spec/views/admin/conference/edit.html.haml_spec.rb
View file

@ -3,10 +3,10 @@ require 'spec_helper'
describe 'admin/conference/edit' do
it 'renders conference details which are editable' do
@conference = create(:conference, title: 'OpenSUSE')
@conference = create(:conference, title: 'openSUSE')
assign :conference, @conference
render template: 'admin/conference/edit.html.haml'
expect(rendered).to include('OpenSUSE')
expect(rendered).to include('openSUSE')
expect(rendered).to include("#{@conference.contact_email}")
end
end

6
spec/views/admin/conference/index.html.haml_spec.rb
View file

@ -2,9 +2,9 @@ require 'spec_helper'
describe 'admin/conference/index' do
it 'renders all conference names with links' do
assign(:conferences, [create(:conference, title: 'OpenSUSE'), create(:conference)])
assign(:conferences, [create(:conference, title: 'openSUSE'), create(:conference)])
render
expect(rendered).to include('OpenSUSE')
expect(rendered).to include("The dog and pony show")
expect(rendered).to include('openSUSE')
expect(rendered).to include('The dog and pony show')
end
end

2
spec/views/admin/conference/show.html.haml_spec.rb
View file

@ -3,7 +3,7 @@ require 'spec_helper'
describe 'admin/conference/show' do
it 'renders conference dashboard' do
conference = create(:conference, title: 'OpenSUSE')
conference = create(:conference, title: 'openSUSE')
assign :conference, conference
assign :conference_progress, conference.get_status
render

2
spec/views/admin/social_events/index.html.haml_spec.rb
View file

@ -2,7 +2,7 @@ require 'spec_helper'
describe 'admin/social_events/index' do
it 'renders social events' do
it 'renders social events' do
@social_event = create(:social_event)
assign :conference, @social_event.conference
render

2
spec/views/admin/volunteers/show.html.haml_spec.rb
View file

@ -1,5 +1,5 @@
require 'spec_helper'
describe "admin/volunteers/show" do
describe 'admin/volunteers/show' do
pending "add some examples to (or delete) #{__FILE__}"
end

8
spec/views/conference/show.html.haml_spec.rb
View file

@ -10,8 +10,8 @@ describe 'conference/show.html.haml' do
sponsor_email: 'example@example.com',
facebook_url: 'http://www.fbexample.com',
google_url: 'http://www.google-example.com',
instagram_url: "http://instagram.com",
twitter_url: "http://twitter.com",
instagram_url: 'http://instagram.com',
twitter_url: 'http://twitter.com',
include_registrations_in_splash: true,
include_program_in_splash: true,
include_sponsors_in_splash: true,
@ -65,8 +65,8 @@ describe 'conference/show.html.haml' do
expect(view).to render_template('conference/_social_media')
expect(view.content_for(:splash)).to include('http://www.fbexample.com')
expect(view.content_for(:splash)).to include('http://www.google-example.com')
expect(view.content_for(:splash)).to include("http://instagram.com")
expect(view.content_for(:splash)).to include("http://twitter.com")
expect(view.content_for(:splash)).to include('http://instagram.com')
expect(view.content_for(:splash)).to include('http://twitter.com')
end
it 'renders location partial' do