-
Notifications
You must be signed in to change notification settings - Fork 2
New issue
Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? # to your account
MERGE TO FEATURE BRANCH - 214 - Test viewing pages - MERGE FIRST #475
Merged
crowesn
merged 6 commits into
214-feature-branch-refactor-feature-testing
from
214-branch-test-viewing-pages
Apr 29, 2024
Merged
MERGE TO FEATURE BRANCH - 214 - Test viewing pages - MERGE FIRST #475
crowesn
merged 6 commits into
214-feature-branch-refactor-feature-testing
from
214-branch-test-viewing-pages
Apr 29, 2024
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Janell-Huyck
changed the base branch from
qa
to
214-feature-branch-refactor-feature-testing
April 22, 2024 17:52
Janell-Huyck
force-pushed
the
214-feature-branch-refactor-feature-testing
branch
from
April 23, 2024 17:28
9b3e3c2
to
d99616b
Compare
Janell-Huyck
force-pushed
the
214-branch-test-viewing-pages
branch
from
April 23, 2024 19:12
512f326
to
649cf08
Compare
Janell-Huyck
changed the title
WIP MERGE TO FEATURE BRANCH - 214 - Test viewing pages - WIP
MERGE TO FEATURE BRANCH - 214 - Test viewing pages - MERGE SECOND
Apr 23, 2024
Janell-Huyck
changed the title
MERGE TO FEATURE BRANCH - 214 - Test viewing pages - MERGE SECOND
MERGE TO FEATURE BRANCH - 214 - Test viewing pages - MERGE FIRST
Apr 23, 2024
Janell-Huyck
force-pushed
the
214-feature-branch-refactor-feature-testing
branch
from
April 24, 2024 13:08
03f3ce4
to
b148319
Compare
Janell-Huyck
force-pushed
the
214-branch-test-viewing-pages
branch
2 times, most recently
from
April 24, 2024 13:35
0fb3996
to
8c62b8b
Compare
Janell-Huyck
force-pushed
the
214-feature-branch-refactor-feature-testing
branch
from
April 26, 2024 17:22
b148319
to
5bf3ab7
Compare
Janell-Huyck
force-pushed
the
214-branch-test-viewing-pages
branch
from
April 29, 2024 13:03
97ce283
to
3ef5249
Compare
crowesn
approved these changes
Apr 29, 2024
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Very good. Merging.
crowesn
merged commit Apr 29, 2024
187bd8e
into
214-feature-branch-refactor-feature-testing
2 checks passed
Janell-Huyck
added a commit
that referenced
this pull request
May 1, 2024
* Lay out proposed file structure for tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Use shared examples and context for page viewing * Rubocop & add Capybara wait time
crowesn
pushed a commit
that referenced
this pull request
May 2, 2024
…#487) * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * MERGE TO FEATURE BRANCH - 214 - Test viewing pages - MERGE FIRST (#475) * Lay out proposed file structure for tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Use shared examples and context for page viewing * Rubocop & add Capybara wait time * MERGE TO FEATURE BRANCH - 214 - Test Header and Search - MERGE FIRST (#481) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * MERGE TO FEATURE BRANCH - 214 Test Conservation Record Creation - MERGE FIRST (#485) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * Test conservation_record creation in feature tests * Fix accidental rubocop error created by manual merge conflict resolution * Rubocop fix * Move editing cons record to shared example * Correct cons record factory * Rubocop fix * Fix some broken tests * Rubocop fix * Add seeding to the circleci testing: * Update tests
crowesn
pushed a commit
that referenced
this pull request
May 2, 2024
* Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * MERGE TO FEATURE BRANCH - 214 - Test viewing pages - MERGE FIRST (#475) * Lay out proposed file structure for tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Use shared examples and context for page viewing * Rubocop & add Capybara wait time * MERGE TO FEATURE BRANCH - 214 - Test Header and Search - MERGE FIRST (#481) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * MERGE TO FEATURE BRANCH - 214 Test Conservation Record Creation - MERGE FIRST (#485) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * Test conservation_record creation in feature tests * Fix accidental rubocop error created by manual merge conflict resolution * Rubocop fix * Move editing cons record to shared example * Correct cons record factory * Rubocop fix * Fix some broken tests * Rubocop fix * Add seeding to the circleci testing: * Update tests * Test adding new staff codes * Remove duplicated code related to creating new staff codes * Correct failing test * Fix broken test
crowesn
pushed a commit
that referenced
this pull request
May 3, 2024
* Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * MERGE TO FEATURE BRANCH - 214 - Test viewing pages - MERGE FIRST (#475) * Lay out proposed file structure for tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Use shared examples and context for page viewing * Rubocop & add Capybara wait time * MERGE TO FEATURE BRANCH - 214 - Test Header and Search - MERGE FIRST (#481) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * MERGE TO FEATURE BRANCH - 214 Test Conservation Record Creation - MERGE FIRST (#485) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * Test conservation_record creation in feature tests * Fix accidental rubocop error created by manual merge conflict resolution * Rubocop fix * Move editing cons record to shared example * Correct cons record factory * Rubocop fix * Fix some broken tests * Rubocop fix * Add seeding to the circleci testing: * Update tests * Test adding new staff codes * Remove duplicated code related to creating new staff codes * Correct failing test * Fix more broken tests
crowesn
pushed a commit
that referenced
this pull request
May 3, 2024
* Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * MERGE TO FEATURE BRANCH - 214 - Test viewing pages - MERGE FIRST (#475) * Lay out proposed file structure for tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Use shared examples and context for page viewing * Rubocop & add Capybara wait time * MERGE TO FEATURE BRANCH - 214 - Test Header and Search - MERGE FIRST (#481) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * MERGE TO FEATURE BRANCH - 214 Test Conservation Record Creation - MERGE FIRST (#485) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * Test conservation_record creation in feature tests * Fix accidental rubocop error created by manual merge conflict resolution * Rubocop fix * Move editing cons record to shared example * Correct cons record factory * Rubocop fix * Fix some broken tests * Rubocop fix * Add seeding to the circleci testing: * Update tests * Test adding new staff codes * Remove duplicated code related to creating new staff codes * Correct failing test * Fix more broken tests * Test creating a new user * Fix failing test
crowesn
pushed a commit
that referenced
this pull request
May 3, 2024
* Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * MERGE TO FEATURE BRANCH - 214 - Test viewing pages - MERGE FIRST (#475) * Lay out proposed file structure for tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Use shared examples and context for page viewing * Rubocop & add Capybara wait time * MERGE TO FEATURE BRANCH - 214 - Test Header and Search - MERGE FIRST (#481) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * MERGE TO FEATURE BRANCH - 214 Test Conservation Record Creation - MERGE FIRST (#485) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * Test conservation_record creation in feature tests * Fix accidental rubocop error created by manual merge conflict resolution * Rubocop fix * Move editing cons record to shared example * Correct cons record factory * Rubocop fix * Fix some broken tests * Rubocop fix * Add seeding to the circleci testing: * Update tests * Test adding new staff codes * Remove duplicated code related to creating new staff codes * Correct failing test * Fix more broken tests * Test creating a new user * WIP - Edit User Specs * Fix broken tests
crowesn
pushed a commit
that referenced
this pull request
May 3, 2024
…IRST (#492) * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * MERGE TO FEATURE BRANCH - 214 - Test viewing pages - MERGE FIRST (#475) * Lay out proposed file structure for tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Use shared examples and context for page viewing * Rubocop & add Capybara wait time * MERGE TO FEATURE BRANCH - 214 - Test Header and Search - MERGE FIRST (#481) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * MERGE TO FEATURE BRANCH - 214 Test Conservation Record Creation - MERGE FIRST (#485) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * Test conservation_record creation in feature tests * Fix accidental rubocop error created by manual merge conflict resolution * Rubocop fix * Move editing cons record to shared example * Correct cons record factory * Rubocop fix * Fix some broken tests * Rubocop fix * Add seeding to the circleci testing: * Update tests * Test adding new staff codes * Remove duplicated code related to creating new staff codes * Correct failing test * Fix more broken tests * Test creating a new user * WIP - Edit User Specs * Fix broken tests * Migrate controlled vocab creation specs * Correct spelling name of test
Janell-Huyck
added a commit
that referenced
this pull request
May 28, 2024
* Lay out proposed file structure for tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Use shared examples and context for page viewing * Rubocop & add Capybara wait time
Janell-Huyck
added a commit
that referenced
this pull request
May 28, 2024
…#487) * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * MERGE TO FEATURE BRANCH - 214 - Test viewing pages - MERGE FIRST (#475) * Lay out proposed file structure for tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Use shared examples and context for page viewing * Rubocop & add Capybara wait time * MERGE TO FEATURE BRANCH - 214 - Test Header and Search - MERGE FIRST (#481) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * MERGE TO FEATURE BRANCH - 214 Test Conservation Record Creation - MERGE FIRST (#485) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * Test conservation_record creation in feature tests * Fix accidental rubocop error created by manual merge conflict resolution * Rubocop fix * Move editing cons record to shared example * Correct cons record factory * Rubocop fix * Fix some broken tests * Rubocop fix * Add seeding to the circleci testing: * Update tests
Janell-Huyck
added a commit
that referenced
this pull request
May 28, 2024
* Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * MERGE TO FEATURE BRANCH - 214 - Test viewing pages - MERGE FIRST (#475) * Lay out proposed file structure for tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Use shared examples and context for page viewing * Rubocop & add Capybara wait time * MERGE TO FEATURE BRANCH - 214 - Test Header and Search - MERGE FIRST (#481) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * MERGE TO FEATURE BRANCH - 214 Test Conservation Record Creation - MERGE FIRST (#485) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * Test conservation_record creation in feature tests * Fix accidental rubocop error created by manual merge conflict resolution * Rubocop fix * Move editing cons record to shared example * Correct cons record factory * Rubocop fix * Fix some broken tests * Rubocop fix * Add seeding to the circleci testing: * Update tests * Test adding new staff codes * Remove duplicated code related to creating new staff codes * Correct failing test * Fix broken test
Janell-Huyck
added a commit
that referenced
this pull request
May 28, 2024
* Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * MERGE TO FEATURE BRANCH - 214 - Test viewing pages - MERGE FIRST (#475) * Lay out proposed file structure for tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Use shared examples and context for page viewing * Rubocop & add Capybara wait time * MERGE TO FEATURE BRANCH - 214 - Test Header and Search - MERGE FIRST (#481) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * MERGE TO FEATURE BRANCH - 214 Test Conservation Record Creation - MERGE FIRST (#485) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * Test conservation_record creation in feature tests * Fix accidental rubocop error created by manual merge conflict resolution * Rubocop fix * Move editing cons record to shared example * Correct cons record factory * Rubocop fix * Fix some broken tests * Rubocop fix * Add seeding to the circleci testing: * Update tests * Test adding new staff codes * Remove duplicated code related to creating new staff codes * Correct failing test * Fix more broken tests
Janell-Huyck
added a commit
that referenced
this pull request
May 28, 2024
* Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * MERGE TO FEATURE BRANCH - 214 - Test viewing pages - MERGE FIRST (#475) * Lay out proposed file structure for tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Use shared examples and context for page viewing * Rubocop & add Capybara wait time * MERGE TO FEATURE BRANCH - 214 - Test Header and Search - MERGE FIRST (#481) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * MERGE TO FEATURE BRANCH - 214 Test Conservation Record Creation - MERGE FIRST (#485) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * Test conservation_record creation in feature tests * Fix accidental rubocop error created by manual merge conflict resolution * Rubocop fix * Move editing cons record to shared example * Correct cons record factory * Rubocop fix * Fix some broken tests * Rubocop fix * Add seeding to the circleci testing: * Update tests * Test adding new staff codes * Remove duplicated code related to creating new staff codes * Correct failing test * Fix more broken tests * Test creating a new user * Fix failing test
Janell-Huyck
added a commit
that referenced
this pull request
May 28, 2024
* Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * MERGE TO FEATURE BRANCH - 214 - Test viewing pages - MERGE FIRST (#475) * Lay out proposed file structure for tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Use shared examples and context for page viewing * Rubocop & add Capybara wait time * MERGE TO FEATURE BRANCH - 214 - Test Header and Search - MERGE FIRST (#481) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * MERGE TO FEATURE BRANCH - 214 Test Conservation Record Creation - MERGE FIRST (#485) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * Test conservation_record creation in feature tests * Fix accidental rubocop error created by manual merge conflict resolution * Rubocop fix * Move editing cons record to shared example * Correct cons record factory * Rubocop fix * Fix some broken tests * Rubocop fix * Add seeding to the circleci testing: * Update tests * Test adding new staff codes * Remove duplicated code related to creating new staff codes * Correct failing test * Fix more broken tests * Test creating a new user * WIP - Edit User Specs * Fix broken tests
Janell-Huyck
added a commit
that referenced
this pull request
May 28, 2024
…IRST (#492) * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * MERGE TO FEATURE BRANCH - 214 - Test viewing pages - MERGE FIRST (#475) * Lay out proposed file structure for tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Use shared examples and context for page viewing * Rubocop & add Capybara wait time * MERGE TO FEATURE BRANCH - 214 - Test Header and Search - MERGE FIRST (#481) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * MERGE TO FEATURE BRANCH - 214 Test Conservation Record Creation - MERGE FIRST (#485) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * Test conservation_record creation in feature tests * Fix accidental rubocop error created by manual merge conflict resolution * Rubocop fix * Move editing cons record to shared example * Correct cons record factory * Rubocop fix * Fix some broken tests * Rubocop fix * Add seeding to the circleci testing: * Update tests * Test adding new staff codes * Remove duplicated code related to creating new staff codes * Correct failing test * Fix more broken tests * Test creating a new user * WIP - Edit User Specs * Fix broken tests * Migrate controlled vocab creation specs * Correct spelling name of test
Janell-Huyck
added a commit
that referenced
this pull request
Jul 2, 2024
* Lay out proposed file structure for tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Use shared examples and context for page viewing * Rubocop & add Capybara wait time
Janell-Huyck
added a commit
that referenced
this pull request
Jul 2, 2024
…#487) * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * MERGE TO FEATURE BRANCH - 214 - Test viewing pages - MERGE FIRST (#475) * Lay out proposed file structure for tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Use shared examples and context for page viewing * Rubocop & add Capybara wait time * MERGE TO FEATURE BRANCH - 214 - Test Header and Search - MERGE FIRST (#481) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * MERGE TO FEATURE BRANCH - 214 Test Conservation Record Creation - MERGE FIRST (#485) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * Test conservation_record creation in feature tests * Fix accidental rubocop error created by manual merge conflict resolution * Rubocop fix * Move editing cons record to shared example * Correct cons record factory * Rubocop fix * Fix some broken tests * Rubocop fix * Add seeding to the circleci testing: * Update tests
Janell-Huyck
added a commit
that referenced
this pull request
Jul 2, 2024
* Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * MERGE TO FEATURE BRANCH - 214 - Test viewing pages - MERGE FIRST (#475) * Lay out proposed file structure for tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Use shared examples and context for page viewing * Rubocop & add Capybara wait time * MERGE TO FEATURE BRANCH - 214 - Test Header and Search - MERGE FIRST (#481) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * MERGE TO FEATURE BRANCH - 214 Test Conservation Record Creation - MERGE FIRST (#485) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * Test conservation_record creation in feature tests * Fix accidental rubocop error created by manual merge conflict resolution * Rubocop fix * Move editing cons record to shared example * Correct cons record factory * Rubocop fix * Fix some broken tests * Rubocop fix * Add seeding to the circleci testing: * Update tests * Test adding new staff codes * Remove duplicated code related to creating new staff codes * Correct failing test * Fix broken test
Janell-Huyck
added a commit
that referenced
this pull request
Jul 2, 2024
* Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * MERGE TO FEATURE BRANCH - 214 - Test viewing pages - MERGE FIRST (#475) * Lay out proposed file structure for tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Use shared examples and context for page viewing * Rubocop & add Capybara wait time * MERGE TO FEATURE BRANCH - 214 - Test Header and Search - MERGE FIRST (#481) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * MERGE TO FEATURE BRANCH - 214 Test Conservation Record Creation - MERGE FIRST (#485) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * Test conservation_record creation in feature tests * Fix accidental rubocop error created by manual merge conflict resolution * Rubocop fix * Move editing cons record to shared example * Correct cons record factory * Rubocop fix * Fix some broken tests * Rubocop fix * Add seeding to the circleci testing: * Update tests * Test adding new staff codes * Remove duplicated code related to creating new staff codes * Correct failing test * Fix more broken tests
Janell-Huyck
added a commit
that referenced
this pull request
Jul 2, 2024
* Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * MERGE TO FEATURE BRANCH - 214 - Test viewing pages - MERGE FIRST (#475) * Lay out proposed file structure for tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Use shared examples and context for page viewing * Rubocop & add Capybara wait time * MERGE TO FEATURE BRANCH - 214 - Test Header and Search - MERGE FIRST (#481) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * MERGE TO FEATURE BRANCH - 214 Test Conservation Record Creation - MERGE FIRST (#485) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * Test conservation_record creation in feature tests * Fix accidental rubocop error created by manual merge conflict resolution * Rubocop fix * Move editing cons record to shared example * Correct cons record factory * Rubocop fix * Fix some broken tests * Rubocop fix * Add seeding to the circleci testing: * Update tests * Test adding new staff codes * Remove duplicated code related to creating new staff codes * Correct failing test * Fix more broken tests * Test creating a new user * Fix failing test
Janell-Huyck
added a commit
that referenced
this pull request
Jul 2, 2024
* Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * MERGE TO FEATURE BRANCH - 214 - Test viewing pages - MERGE FIRST (#475) * Lay out proposed file structure for tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Use shared examples and context for page viewing * Rubocop & add Capybara wait time * MERGE TO FEATURE BRANCH - 214 - Test Header and Search - MERGE FIRST (#481) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * MERGE TO FEATURE BRANCH - 214 Test Conservation Record Creation - MERGE FIRST (#485) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * Test conservation_record creation in feature tests * Fix accidental rubocop error created by manual merge conflict resolution * Rubocop fix * Move editing cons record to shared example * Correct cons record factory * Rubocop fix * Fix some broken tests * Rubocop fix * Add seeding to the circleci testing: * Update tests * Test adding new staff codes * Remove duplicated code related to creating new staff codes * Correct failing test * Fix more broken tests * Test creating a new user * WIP - Edit User Specs * Fix broken tests
Janell-Huyck
added a commit
that referenced
this pull request
Jul 2, 2024
…IRST (#492) * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * MERGE TO FEATURE BRANCH - 214 - Test viewing pages - MERGE FIRST (#475) * Lay out proposed file structure for tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Use shared examples and context for page viewing * Rubocop & add Capybara wait time * MERGE TO FEATURE BRANCH - 214 - Test Header and Search - MERGE FIRST (#481) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * MERGE TO FEATURE BRANCH - 214 Test Conservation Record Creation - MERGE FIRST (#485) * Lay out proposed file structure for tests * Update rails_helper.rb and fix broken tests * Merge conflicts * Rebase merge conflict * Log in use specs with context * Rubocop: * Rubocop * Use shared examples and context for page viewing * Check headers and search functionality * Lay out proposed file structure for tests * Merge conflict resolved * Merge conflicts * Rebase merge conflict * Rubocop: * Test conservation_record creation in feature tests * Fix accidental rubocop error created by manual merge conflict resolution * Rubocop fix * Move editing cons record to shared example * Correct cons record factory * Rubocop fix * Fix some broken tests * Rubocop fix * Add seeding to the circleci testing: * Update tests * Test adding new staff codes * Remove duplicated code related to creating new staff codes * Correct failing test * Fix more broken tests * Test creating a new user * WIP - Edit User Specs * Fix broken tests * Migrate controlled vocab creation specs * Correct spelling name of test
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Relates to #214
This PR checks whether or not the four user types (non-authenticated, read-only, standard, and admin) can view the following pages:
This is done by logging the user in using contexts, and then using shared examples for what the user should be able to see (
it_behaves_like 'view controlled vocabularies'
), or helper methods (prevents_anonymous_access
andprevents_unauthorized_access
) for pages that the user should not be able to access.We use those two different helper methods because the messages and redirects are different for logged-in but unauthorized users vs users who haven't logged in. Users who can view a page are referred to the shared examples. A user who isn't permitted to view those pages would fail the tests, so instead they are referred to the helper methods that check their refusal.
This PR does not check whether a user can edit or create any records. That will be addressed in a different PR.