codeforleipzig/stadtratmonitor
codeforleipzig/stadtratmonitor
1
1
Fork 0
mirror of https://github.com/CodeforLeipzig/stadtratmonitor.git synced 2025-04-20 07:11:33 +02:00
Code Issues Projects Releases Packages 4 Wiki Activity

Migration to Ruby 2.5, Rails 5.1.5, Elasticsearch 5.4.3

Browse source
This commit is contained in:
Joerg Reichert 2018-03-18 21:21:59 +01:00
parent 85d2ad5d57
commit ad77627973
17 changed files with 180 additions and 170 deletions
Download patch file Download diff file Expand all files Collapse all files

2
spec/factories/papers.rb
View file

@ -1,6 +1,6 @@
require_relative '../factory_helper'
FactoryGirl.define do
FactoryBot.define do
factory :paper do
name { Faker::Lorem.sentence }
sequence(:url) { |n| Faker::Internet.url("ris.example.org", "/paper-#{n}.html") }

40
spec/features/basic_search_spec.rb
View file

@ -4,7 +4,7 @@ require 'pp'
RSpec.feature "Basic search", type: :feature, elasticsearch: true do
before(:each) do
@papers = FactoryGirl.create_list(:paper, 11)
@papers = FactoryBot.create_list(:paper, 11)
Paper.__elasticsearch__.refresh_index!
end
@ -63,7 +63,7 @@ RSpec.feature "Basic search", type: :feature, elasticsearch: true do
end
scenario "Finds papers by name" do
paper = FactoryGirl.create(:paper, name: "Opendata als default")
paper = FactoryBot.create(:paper, name: "Opendata als default")
Paper.__elasticsearch__.refresh_index!
visit search_path body: "leipzig", paper_search: {query: "Opendata"}
expect(page).to have_content("1 Dokument in der Datenbank")
@ -76,7 +76,7 @@ RSpec.feature "Basic search", type: :feature, elasticsearch: true do
end
scenario "Finds papers by content" do
paper = FactoryGirl.create(:paper,
paper = FactoryBot.create(:paper,
name: "Opendata als default",
content: "Alle Verwaltungsdokumente werden als Opendata veröffentlicht"
)
@ -92,9 +92,9 @@ RSpec.feature "Basic search", type: :feature, elasticsearch: true do
end
scenario "Papers with common reference id in search result ordered by date" do
mainPaper = FactoryGirl.create(:paper, published_at: '2016-12-19T19:00:00',
mainPaper = FactoryBot.create(:paper, published_at: '2016-12-19T19:00:00',
name: "Opendata als default", reference: "VI-0815")
newPaper = FactoryGirl.create(:paper, published_at: '2016-12-23T12:00:00',
newPaper = FactoryBot.create(:paper, published_at: '2016-12-23T12:00:00',
name: "Opendata als optional", reference: "VI-0815-ÄA-01")
Paper.__elasticsearch__.refresh_index!
visit search_path body: "leipzig", paper_search: {query: "default"}
@ -112,11 +112,11 @@ RSpec.feature "Basic search", type: :feature, elasticsearch: true do
end
scenario "Papers with common reference id in search result ordered by ref" do
mainPaper = FactoryGirl.create(:paper, published_at: '2016-12-19T19:00:00',
mainPaper = FactoryBot.create(:paper, published_at: '2016-12-19T19:00:00',
name: "Opendata als default", reference: "VI-0815")
newPaper1 = FactoryGirl.create(:paper, published_at: '2016-12-23T12:00:00',
newPaper1 = FactoryBot.create(:paper, published_at: '2016-12-23T12:00:00',
name: "Opendata als optional", reference: "VI-0815-ÄA-02")
newPaper2 = FactoryGirl.create(:paper, published_at: '2016-12-23T12:00:00',
newPaper2 = FactoryBot.create(:paper, published_at: '2016-12-23T12:00:00',
name: "Opendata als optional", reference: "VI-0815-ÄA-01")
Paper.__elasticsearch__.refresh_index!
visit search_path body: "leipzig", paper_search: {query: "default"}
@ -131,11 +131,11 @@ RSpec.feature "Basic search", type: :feature, elasticsearch: true do
end
scenario "Papers with common reference id handled also for missing prefix" do
mainPaper = FactoryGirl.create(:paper, published_at: '2016-12-19T19:00:00',
mainPaper = FactoryBot.create(:paper, published_at: '2016-12-19T19:00:00',
name: "Opendata als default", reference: "VI-0815")
newPaper1 = FactoryGirl.create(:paper, published_at: '2016-12-23T12:00:00',
newPaper1 = FactoryBot.create(:paper, published_at: '2016-12-23T12:00:00',
name: "Opendata als optional", reference: "VI-0815-NF-01")
newPaper1Change = FactoryGirl.create(:paper, published_at: '2016-12-23T12:00:00',
newPaper1Change = FactoryBot.create(:paper, published_at: '2016-12-23T12:00:00',
name: "Opendata als nicht optional", reference: "-0815-NF-01-ÄA-01")
Paper.__elasticsearch__.refresh_index!
visit search_path body: "leipzig", paper_search: {query: "default"}
@ -150,7 +150,7 @@ RSpec.feature "Basic search", type: :feature, elasticsearch: true do
end
scenario "Finds 'Testen' with search 'Test'" do
paper = FactoryGirl.create(:paper, name: "Testen")
paper = FactoryBot.create(:paper, name: "Testen")
Paper.__elasticsearch__.refresh_index!
visit search_path body: "leipzig", paper_search: {query: "Test"}
expect(page).to have_content("1 Dokument in der Datenbank")
@ -159,7 +159,7 @@ RSpec.feature "Basic search", type: :feature, elasticsearch: true do
end
scenario "Finds 'Test' with search 'Testen'" do
paper = FactoryGirl.create(:paper, name: "Test")
paper = FactoryBot.create(:paper, name: "Test")
Paper.__elasticsearch__.refresh_index!
visit search_path body: "leipzig", paper_search: {query: "Testen"}
expect(page).to have_content("1 Dokument in der Datenbank")
@ -168,7 +168,7 @@ RSpec.feature "Basic search", type: :feature, elasticsearch: true do
end
scenario "Finds 'Fahrräderverleih' with search 'Fahrrad'" do
paper = FactoryGirl.create(:paper, name: "Fahrräderverleih")
paper = FactoryBot.create(:paper, name: "Fahrräderverleih")
Paper.__elasticsearch__.refresh_index!
visit search_path body: "leipzig", paper_search: {query: "Fahrrad"}
expect(page).to have_content("1 Dokument in der Datenbank")
@ -177,7 +177,7 @@ RSpec.feature "Basic search", type: :feature, elasticsearch: true do
end
scenario "Finds 'Fahrräderverleih' with search 'Fahrräder'" do
paper = FactoryGirl.create(:paper, name: "Fahrräderverleih")
paper = FactoryBot.create(:paper, name: "Fahrräderverleih")
Paper.__elasticsearch__.refresh_index!
visit search_path body: "leipzig", paper_search: {query: "Fahrräder"}
expect(page).to have_content("1 Dokument in der Datenbank")
@ -186,7 +186,7 @@ RSpec.feature "Basic search", type: :feature, elasticsearch: true do
end
scenario "Finds 'Fahrräderverleih' with search 'Verleih'" do
paper = FactoryGirl.create(:paper, name: "Fahrräderverleih")
paper = FactoryBot.create(:paper, name: "Fahrräderverleih")
Paper.__elasticsearch__.refresh_index!
visit search_path body: "leipzig", paper_search: {query: "Verleih"}
expect(page).to have_content("1 Dokument in der Datenbank")
@ -195,7 +195,7 @@ RSpec.feature "Basic search", type: :feature, elasticsearch: true do
end
scenario "Finds 'Fahrräderverleih' with search 'Autoverleih'" do
paper = FactoryGirl.create(:paper, name: "Fahrräderverleih")
paper = FactoryBot.create(:paper, name: "Fahrräderverleih")
Paper.__elasticsearch__.refresh_index!
visit search_path body: "leipzig", paper_search: {query: "Autoverleih"}
expect(page).to have_content("1 Dokument in der Datenbank")
@ -204,16 +204,16 @@ RSpec.feature "Basic search", type: :feature, elasticsearch: true do
end
scenario "Finds no 'Fahrrad' with search 'Rad'" do
paper = FactoryGirl.create(:paper, name: "Fahrrad")
paper = FactoryBot.create(:paper, name: "Fahrrad")
Paper.__elasticsearch__.refresh_index!
visit search_path body: "leipzig", paper_search: {query: "Rad"}
expect(page).to have_content("0 Dokumente in der Datenbank")
end
scenario "Papers with reference id having slash is escaped" do
mainPaper = FactoryGirl.create(:paper, published_at: '2016-12-19T19:00:00',
mainPaper = FactoryBot.create(:paper, published_at: '2016-12-19T19:00:00',
name: "Opendata als default", reference: "VI-00768/14")
newPaper = FactoryGirl.create(:paper, published_at: '2016-12-23T12:00:00',
newPaper = FactoryBot.create(:paper, published_at: '2016-12-23T12:00:00',
name: "Opendata als optional", reference: "VI-00768/14-ÄA-01")
Paper.__elasticsearch__.refresh_index!
visit search_path body: "leipzig", paper_search: {query: "default"}

8
spec/features/search_filters_spec.rb
View file

@ -3,21 +3,21 @@ require 'rails_helper'
RSpec.feature "Search filters", type: :feature, elasticsearch: true do
before(:each) do
@antrag = FactoryGirl.create(:paper,
@antrag = FactoryBot.create(:paper,
paper_type: "Antrag",
name: "Mehr Spielplätze in Leipzig",
originator: "Dezernat Jugend, Soziales, Gesundheit und Schule"
)
@anfrage = FactoryGirl.create(:paper,
@anfrage = FactoryBot.create(:paper,
paper_type: "Anfrage",
originator: "CDU-Fraktion"
)
@vorlage_1 = FactoryGirl.create(:paper,
@vorlage_1 = FactoryBot.create(:paper,
paper_type: "Vorlage",
name: "Zustand der Spielplätze",
originator: "Dezernat Jugend, Soziales, Gesundheit und Schule"
)
@vorlage_2 = FactoryGirl.create(:paper,
@vorlage_2 = FactoryBot.create(:paper,
paper_type: "Vorlage",
name: "Mehr Ampeln in der Innenstadt",
originator: "Oberbürgermeister"

6
spec/models/paper_spec.rb
View file

@ -9,13 +9,13 @@ RSpec.describe Paper do
it { should validate_length_of(:url).is_at_most(1000) }
context "URL uniqueness" do
subject { FactoryGirl.build(:paper) }
subject { FactoryBot.build(:paper) }
it { should validate_uniqueness_of(:url) }
end
it "validate url format sane" do
expected_error = "ist keine gültige URL"
paper = FactoryGirl.build(:paper, url: "wtf")
paper = FactoryBot.build(:paper, url: "wtf")
expect(paper).not_to be_valid, "Expected paper to not be valid with invalid URL"
expect(paper.errors[:url]).not_to be_empty
expect(paper.errors[:url]).to include(expected_error), "Expected #{paper.errors[:url]} to include \"#{expected_error}\""
@ -40,7 +40,7 @@ RSpec.describe Paper do
it { should validate_presence_of(:published_at) }
it "validate date is parseable" do
expected_error = "ist kein gültiges Datum"
paper = FactoryGirl.build(:paper, published_at: "fubar")
paper = FactoryBot.build(:paper, published_at: "fubar")
expect(paper).not_to be_valid
expect(paper.errors[:published_at]).not_to be_empty
expect(paper.errors[:published_at]).to include(expected_error), "Expected #{paper.errors[:published_at]} to include \"#{expected_error}\""

3
spec/support/factory_bot.rb Normal file
View file

@ -0,0 +1,3 @@
RSpec.configure do |config|
config.include FactoryBot::Syntax::Methods
end

3
spec/support/factory_girl.rb
View file

@ -1,3 +0,0 @@
RSpec.configure do |config|
config.include FactoryGirl::Syntax::Methods
end