Skip to content
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 Header and Search - MERGE FIRST #481

Merged

Conversation

Janell-Huyck
Copy link
Contributor

@Janell-Huyck Janell-Huyck commented Apr 25, 2024

This PR continues the modular feature testing path by including tests for what should and should not be included in the header. It also adds in checks for the functionality of the search box by title and item number, since the search box is inside the header.

File changes:

  • spec/features/end_to_end_spec.rb
    • remove checks of the search box, as this is now done in modular test
  • spec/features/specs/user_scenarios/admin_user_spec.rb
    • add check for admin_user header
  • spec/features/specs/user_scenarios/non_authenticated_user_spec.rb
    • add check for non-authenticated user header
  • spec/features/specs/user_scenarios/read_only_user_spec.rb
    • add check for read-only user header
  • spec/features/specs/user_scenarios/standard_user_spec.rb
    • add check for standard user header
  • spec/features/support/helpers/unauthorized_access_helpers.rb
    • remove duplicated call to frozen string literal
  • spec/features/support/shared_examples/header_checks/admin_user_header_check.rb
    • new file - tests for admin header
  • spec/features/support/shared_examples/header_checks/non_authenticated_user_header_check.rb
    • new file - tests for non-authenticated user header
  • spec/features/support/shared_examples/header_checks/read_only_user_header_check.rb
    • new file - tests for read-only-user header
  • spec/features/support/shared_examples/header_checks/search_area_functionality_check.rb
    • new file - tests presence and functioning of the search area
  • spec/features/support/shared_examples/header_checks/standard_user_header_check.rb
    • new file - tests for standard user's header

@Janell-Huyck Janell-Huyck force-pushed the 214-branch-test-header-links branch from 9f1ade5 to 5472eb9 Compare April 25, 2024 18:04
@Janell-Huyck Janell-Huyck force-pushed the 214-feature-branch-refactor-feature-testing branch from b148319 to 5bf3ab7 Compare April 26, 2024 17:22
@Janell-Huyck Janell-Huyck force-pushed the 214-branch-test-header-links branch from fbfcb2f to e90a1d0 Compare April 29, 2024 13:18
@Janell-Huyck Janell-Huyck changed the title MERGE TO FEATURE BRANCH - 214 - Test Header and Search - MERGE SECOND MERGE TO FEATURE BRANCH - 214 - Test Header and Search - MERGE FIRST Apr 29, 2024
Copy link
Contributor

@crowesn crowesn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Merging.

@crowesn crowesn merged commit 8823e50 into 214-feature-branch-refactor-feature-testing Apr 30, 2024
2 checks passed
@crowesn crowesn deleted the 214-branch-test-header-links branch April 30, 2024 18:01
Janell-Huyck added a commit that referenced this pull request May 1, 2024
…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:
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
…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:
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
…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:
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
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants