andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

Upgraded to Rails 4

Browse Source
This commit is contained in:
Andreas Stephanides
2019-02-24 15:47:27 +01:00
parent f52ec0411d
commit f809f36c06
86 changed files with 732 additions and 662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spec/views/fetprofiles/edit.html.erb_spec.rb
View File

@@ -4,7 +4,7 @@ describe "fetprofiles/edit", :type=> :view do
foreach_theme do
login_fet_user
before(:each) do
@fetprofile = FactoryGirl.create(:fetprofile_withadress,:skype => "myskypename")
@fetprofile = FactoryBot.create(:fetprofile_withadress,:skype => "myskypename")
@memberships = []
end

4
spec/views/fetprofiles/fetprofile.html.erb_spec.rb
View File

@@ -6,9 +6,9 @@ include Devise::TestHelpers
include Rails.application.routes.url_helpers
before(:each) do
# @fetprofile =
#assign(:fetprofile, stub_model(Fetprofile, FactoryGirl.attributes_for(:fetprofile)))
#assign(:fetprofile, stub_model(Fetprofile, FactoryBot.attributes_for(:fetprofile)))
default_url_options[:locale] = :de
@fetprofile = FactoryGirl.create(:fetprofile)
@fetprofile = FactoryBot.create(:fetprofile)
# assign(:fetprofile,@fetprofile)
# assign(:memberships, [])
end

8
spec/views/fetprofiles/index.html.erb_spec.rb
View File

@@ -5,10 +5,10 @@ describe "fetprofiles/index" , :type=>:view do
foreach_theme do
before(:each) do
# default_url_options[:locale] = :de
@fetprofile1 = FactoryGirl.create(:fetprofile)
@fetprofile2 = FactoryGirl.create(:fetprofile2)
@fetprofile3 = FactoryGirl.create(:fetprofile3)
@fetprofile4 = FactoryGirl.create(:fetprofile_withadress)
@fetprofile1 = FactoryBot.create(:fetprofile)
@fetprofile2 = FactoryBot.create(:fetprofile2)
@fetprofile3 = FactoryBot.create(:fetprofile3)
@fetprofile4 = FactoryBot.create(:fetprofile_withadress)
@fetprofiles=[@fetprofile1, @fetprofile2, @fetprofile3, @fetprofile4]
assign(:fetprofiles,@fetprofiles)
assign(:gremientabs, [])

2
spec/views/fetprofiles/new.html.erb_spec.rb
View File

@@ -3,7 +3,7 @@ require 'spec_helper'
describe "fetprofiles/new", :type=> :view do
foreach_theme do
before(:each) do
@fetprofile = FactoryGirl.create(:fetprofile_withadress,:skype => "myskypename")
@fetprofile = FactoryBot.create(:fetprofile_withadress,:skype => "myskypename")
@memberships = []
end

10
spec/views/fetprofiles/show.html.erb_spec.rb
View File

@@ -5,13 +5,13 @@ describe "fetprofiles/show", :type => :view do
before(:each) do
default_url_options[:locale] = :de
@fetprofile = FactoryGirl.create(:fetprofile_withadress)
@fetprofile = FactoryBot.create(:fetprofile_withadress)
assign(:fetprofile,@fetprofile)
@gremium = FactoryGirl.create(:gremium)
@gremium2 = FactoryGirl.create(:gremium, name:"Kommission2")
@gremium3 = FactoryGirl.create(:gremium, name:"Kommission3", typ: 2)
@gremium = FactoryBot.create(:gremium)
@gremium2 = FactoryBot.create(:gremium, name:"Kommission2")
@gremium3 = FactoryBot.create(:gremium, name:"Kommission3", typ: 2)
assign(:memberships, [FactoryGirl.create(:membership,gremium_id: @gremium.id, fetprofile_id: @fetprofile.id)])
assign(:memberships, [FactoryBot.create(:membership,gremium_id: @gremium.id, fetprofile_id: @fetprofile.id)])
assign(:gremientabs, [@gremium2])
# view.theme "blue2"
end