Skip to content

Commit 94ada60

Browse files
committed
ISSUE #408: remove code from research_line
1 parent 7b44897 commit 94ada60

8 files changed

Lines changed: 22 additions & 30 deletions

File tree

app/controllers/research_lines_controller.rb

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,10 @@ class ResearchLinesController < ApplicationController
1010
config.actions.swap :search, :field_search
1111
config.field_search.columns = [
1212
:name,
13-
:code,
1413
:research_area,
1514
:professors
1615
]
1716
config.columns[:name].search_ui = :text
18-
config.columns[:code].search_ui = :text
1917
config.columns[:professors].search_ui = :record_select
2018

2119
config.list.sorting = { name: "ASC" }
@@ -25,9 +23,9 @@ class ResearchLinesController < ApplicationController
2523
professors: :professor_research_lines
2624
}
2725

28-
config.columns = [:name, :code, :research_area, :professor_research_lines, :available]
26+
config.columns = [:name, :research_area, :professor_research_lines, :available]
2927
config.columns[:research_area].form_ui = :record_select
30-
config.list.columns = [:name, :code, :research_area, :available]
28+
config.list.columns = [:name, :research_area, :available]
3129

3230
config.actions.exclude :deleted_records
3331
end

app/models/research_line.rb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,4 @@ class ResearchLine < ApplicationRecord
1515
has_many :professors, through: :professor_research_lines
1616

1717
validates :name, presence: true, uniqueness: true
18-
validates :code, presence: true, uniqueness: true
19-
20-
def to_label
21-
"#{code} - #{name}"
22-
end
2318
end
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
class RemoveCodeFromResearchLines < ActiveRecord::Migration[7.0]
2+
def up
3+
remove_column :research_lines, :code
4+
end
5+
def down
6+
add_column :research_lines, :code, :string
7+
end
8+
end

db/schema.rb

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

spec/factories/factory_research_line.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,6 @@
55
sequence :name do |name|
66
"ResearchLine_#{name}"
77
end
8-
sequence :code do |code|
9-
"ResearchLine_#{code}"
10-
end
118
research_area
129
available { true }
1310
end

spec/features/enrollments_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
@destroy_all << @research_area1 = FactoryBot.create(:research_area, name: "Ciência de Dados", code: "CD")
3737
@destroy_all << @research_area2 = FactoryBot.create(:research_area, name: "Engenharia de Software", code: "ES")
3838

39-
@destroy_all << @research_line1 = FactoryBot.create(:research_line, name: "Machine Learning", code: "CD-ML", research_area: @research_area1)
40-
@destroy_all << @research_line2 = FactoryBot.create(:research_line, name: "Versionamento", code: "ES-VE", research_area: @research_area2)
39+
@destroy_all << @research_line1 = FactoryBot.create(:research_line, name: "Machine Learning", research_area: @research_area1)
40+
@destroy_all << @research_line2 = FactoryBot.create(:research_line, name: "Versionamento", research_area: @research_area2)
4141

4242

4343
@destroy_all << @phase2 = FactoryBot.create(:phase, name: "Pedido de Banca")

spec/features/research_lines_spec.rb

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
@destroy_all << @research_area = FactoryBot.create(:research_area, name: "Ciência da Computação", code: "CC")
1919
@destroy_all << @research_area1 = FactoryBot.create(:research_area, name: "Sistemas de Informação", code: "SI")
2020

21-
@destroy_all << FactoryBot.create(:research_line, name: "Ciência de Dados", code: "CD", research_area: @research_area)
22-
@destroy_all << @record = FactoryBot.create(:research_line, name: "Engenharia de Software", code: "ES", research_area: @research_area)
23-
@destroy_all << FactoryBot.create(:research_line, name: "Desenvolvimento Web", code: "DW", research_area: @research_area1)
21+
@destroy_all << FactoryBot.create(:research_line, name: "Ciência de Dados", research_area: @research_area)
22+
@destroy_all << @record = FactoryBot.create(:research_line, name: "Engenharia de Software", research_area: @research_area)
23+
@destroy_all << FactoryBot.create(:research_line, name: "Desenvolvimento Web", research_area: @research_area1)
2424
end
2525
after(:each) do
2626
@destroy_later.each(&:delete)
@@ -41,7 +41,7 @@
4141
it "should show table" do
4242
expect(page).to have_content "Linhas de Pesquisa"
4343
expect(page.all("tr th").map(&:text)).to eq [
44-
"Nome", "Código", "Área de Pesquisa", "Linha de Pesquisa Ativa", ""
44+
"Nome", "Área de Pesquisa", "Linha de Pesquisa Ativa", ""
4545
]
4646
end
4747

@@ -62,7 +62,6 @@
6262
fill_record_select("research_area_", "research_areas", "")
6363
within("#as_#{plural_name}-create--form") do
6464
fill_in "Nome", with: "Inteligência Artificial"
65-
fill_in "Código", with: "IA"
6665
end
6766
click_button_and_wait "Salvar"
6867
expect(page).to have_css("tr:nth-child(1) td.name-column", text: "Inteligência Artificial")

spec/models/research_line_spec.rb

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
let(:research_line) do
1818
ResearchLine.new(
1919
name: "Banco de Dados",
20-
code: "BD",
2120
research_area: research_area
2221
)
2322
end
@@ -27,18 +26,14 @@
2726
it { should be_valid }
2827
it { should validate_uniqueness_of(:name) }
2928
it { should validate_presence_of(:name) }
30-
it { should validate_uniqueness_of(:code) }
31-
it { should validate_presence_of(:code) }
3229
it { should belong_to(:research_area).required(true) }
3330
end
3431
describe "Methods" do
3532
describe "to_label" do
3633
it "should return the expected string" do
37-
research_line_code = "ResearchLine code"
3834
research_line_name = "ResearchLine name"
39-
research_line.code = research_line_code
4035
research_line.name = research_line_name
41-
expected = "#{research_line_code} - #{research_line_name}"
36+
expected = "#{research_line_name}"
4237
expect(research_line.to_label).to eql(expected)
4338
end
4439
end

0 commit comments

Comments
 (0)