Skip to content

Commit

Permalink
Merge pull request #464 from gems-uff/master
Browse files Browse the repository at this point in the history
Update branch with master
  • Loading branch information
caiovelp authored May 22, 2024
2 parents 4cc98bc + 763a331 commit 4f52731
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 11 deletions.
6 changes: 1 addition & 5 deletions .github/workflows/rubyonrails.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
# This workflow will install a prebuilt Ruby version, install dependencies, and run tests.
name: "Ruby on Rails CI"
on:
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]
on: [push, pull_request]
jobs:
test:
runs-on: ubuntu-latest
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
/app/assets/images/student
coverage/
/vendor/bundle
/node_modules/

# Ignore IDEs and text editors
.idea/
Expand Down
2 changes: 1 addition & 1 deletion app/views/application/_city_widget.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
)
states_path = states_country_path("*")

select_city_id = options[:id]
select_city_id = "widget_" + options[:id]
city_name = options[:name]
city_options = options_for_select(
[[t("helpers.city_widget.select_city"), ""]] +
Expand Down
2 changes: 1 addition & 1 deletion config/environments/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
# Include generic and useful information about system operation, but avoid logging too much
# information to avoid inadvertent exposure of personally identifiable information (PII).
# Set to :debug to see everything in the log.
config.log_level = :debug
config.log_level = :info

# Prepend all log lines with the following tags.
# config.log_tags = [ :request_id ]
Expand Down
2 changes: 1 addition & 1 deletion spec/features/professors_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
end

it "should have identity issuing place widget for identity issuing place" do
expect(find("#widget_record_identity_issuing_place_#{@record.id}").value).to eq @state.name
expect(find("#record_identity_issuing_place_#{@record.id}").value).to eq @state.name
end

it "should have a datepicker for birthdate with a range starting 100 years ago" do
Expand Down
2 changes: 1 addition & 1 deletion spec/features/students_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
end

it "should have identity issuing place widget for identity issuing place" do
expect(find("#widget_record_identity_issuing_place_#{@record.id}").value).to eq @state.name
expect(find("#record_identity_issuing_place_#{@record.id}").value).to eq @state.name
end

it "should have a datepicker for birthdate with a range starting 100 years ago" do
Expand Down
4 changes: 2 additions & 2 deletions spec/support/place_widgets_helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def expect_to_have_city_widget(page, city_field, state_field, country_field)
expect(page.all("select#widget_record_#{city_field} option").map(&:text)).to eq ["Selecione a cidade"]
end

def expect_to_have_identity_issuing_place_widget(page, field)
expect(page).to have_selector("input#widget_record_#{field}_", visible: true)
def expect_to_have_identity_issuing_place_widget(page, field, record_id = "")
expect(page).to have_selector("input#record_#{field}_#{record_id}", visible: true)
end
end

0 comments on commit 4f52731

Please sign in to comment.