Skip to content

Commit

Permalink
Merge branch 'main' into add-to-readme
Browse files Browse the repository at this point in the history
  • Loading branch information
garettarrowood authored Jul 30, 2023
2 parents 726130f + 47f1b5c commit 86fc9aa
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ jobs:
- name: Run containers
working-directory: ./
run: |
docker compose up -d
docker compose up --wait
- name: Curl web page
working-directory: ./
run: |
curl -X GET http://localhost:3000
curl -X GET http://localhost:3000
7 changes: 3 additions & 4 deletions app/models/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@ class User < ApplicationRecord
:recoverable, :rememberable, :validatable

validates :email, presence: true
validates :first_name, presence: true, length: { maximum: 50 }
validates :last_name, presence: true, length: { maximum: 50 }
validates :username, presence: true, uniqueness: true, length: { maximum: 50 }

validates :first_name, presence: true, length: {maximum: 50}
validates :last_name, presence: true, length: {maximum: 50}
validates :username, presence: true, uniqueness: true, length: {maximum: 50}
end
1 change: 1 addition & 0 deletions db/schema.rb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion spec/system/users_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
end

describe "sign up flow" do
it "works" do
xit "works" do
visit "/users/sign_up"

fill_in "Email", with: "[email protected]"
Expand Down

0 comments on commit 86fc9aa

Please sign in to comment.