Skip to content

Commit

Permalink
Merge branch 'main' into 4547-item-dropdown-problem-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
coalest authored Dec 21, 2024
2 parents 01b0ade + 41d7471 commit d2e9d71
Show file tree
Hide file tree
Showing 75 changed files with 1,674 additions and 667 deletions.
File renamed without changes.
46 changes: 41 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,49 @@ Make sure to install **Ubuntu** as your Linux distribution. (This should be defa
<details>
<summary> Bank Users 🏦 </summary>

Pawnee Diaper Bank
A fully set up bank with items, storage locations, donations, distributions, requests, etc.
The bank has multiple partners associated with it.
```
Organization Admin
Email: [email protected]
Email: [email protected]
Password: password!
User
Email: [email protected]
Password: password!
```

Second City Essentials Bank
A fully set up bank with items, storage locations, donations, distributions, requests, etc.
The bank has four items unique to it (named Second City Item #).
```
Organization Admin
Email: [email protected]
Password: password!
User
Email: [email protected]
Password: password!
```

SF Diaper Bank
A bank which has just been accepted and so is not fully set up. It lacks many of the records the other banks have.
```
Organization Admin
Email: [email protected]
Password: password!
User
Email: [email protected]
Password: password!
```
</details>

<details>
<summary> Partner Users 👥 </summary>

Partners in Pawnee Diaper Bank partner groups
```
Verified Partner
Email: [email protected]
Expand All @@ -87,10 +116,17 @@ Make sure to install **Ubuntu** as your Linux distribution. (This should be defa
Waiting Approval Partner
Email: [email protected]
Password: password!
Another approved partner (with all groups):
Another verified partner (in second partner group):
Email: [email protected]
Pasword: password!
Password: password!
```

Partners in Second City Essentials Bank partner group
```
Verified partner
Email: [email protected]
Password: password!
```
</details>

Expand Down Expand Up @@ -221,7 +257,7 @@ Before submitting a pull request, run all tests and lints. Fix any broken tests
- Once your first PR has been merged, all commits pushed to an open PR will also run these workflows.
#### Local testing
- Run all lints with `bin/lint`.
- Run all lints with `bin/lint`. (You can lint a single file/folder with `bin/lint {path_to_folder_or_file}`.)
- Run all tests with `bundle exec rspec`
- You can run a single test with `bundle exec rspec {path_to_test_name}_spec.rb` or on a specific line by appending `:LineNumber`
- If you need to skip a failing test, place `pending("Reason you are skipping the test")` into the `it` block rather than skipping with `xit`. This will allow rspec to deliver the error message without causing the test suite to fail.
Expand Down
4 changes: 3 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ gem "pg", "~> 1.5.7"
# Web server.
gem "puma"
# Rails web framework.
gem "rails", "7.1.3.4"
gem "rails", "7.2.2"

###### MODELS / DATABASE #######

Expand Down Expand Up @@ -100,6 +100,8 @@ gem "jwt"
gem "newrelic_rpm"
# Used to manage periodic cron-like jobs
gem "clockwork"
# Speed up app boot time by caching expensive operations
gem 'bootsnap', require: false

##### DEPENDENCY PINS ######
# These are gems that aren't used directly, only as dependencies for other gems.
Expand Down
Loading

0 comments on commit d2e9d71

Please sign in to comment.