Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge bugbash changes to staging #25111

Merged
merged 28 commits into from
Sep 29, 2018
Merged

Conversation

mehalshah
Copy link
Contributor

@mehalshah mehalshah commented Sep 28, 2018

Collection of changes related to the last few bug bashes

  • Bring back the workshop selection dialog
  • 4 days of bug bash feedback
  • Test improvements

mehalshah and others added 22 commits September 20, 2018 18:16
…t clear responses for payfee if there is no regional partner
style: {
width: '100px',
},
label: PageLabels.section2ChooseYourProgram.csHowManyMinutes.replace('program', this.props.data.program === PROGRAM_CSD ? 'Discoveries' : 'Principles')
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This will show "Principles" when unselected - nice to change

{this.radioButtonsFor('willingToTravel')}

We may offer online academic year workshops for those unable to travel to
their
Copy link
Contributor Author

Choose a reason for hiding this comment

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

line spacing

const changes = {};

if (data.payFee !== TextFields.noPayFee) {
changes.considerForFunding = undefined;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Change to scholarshipReasons

@@ -100,7 +100,7 @@
%i.fa.fa-mobile
- if !@hide_sign_in_option && signin_button_enabled
%span#sign_in_or_user
= render file: Rails.root.join('..', 'shared', 'haml', 'user_header.haml'), locals: user_header_options
=# render file: Rails.root.join('..', 'shared', 'haml', 'user_header.haml'), locals: user_header_options
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Undo this

@@ -856,6 +851,41 @@ class Teacher1920ApplicationTest < ActiveSupport::TestCase
refute Email.exists?(associated_unsent_email.id)
end

test 'test non course dynamically required fields' do
application_hash = build :pd_teacher1920_application_hash,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Make sure that all dynamically required fields are in here

@mehalshah mehalshah merged commit fd1c741 into staging Sep 29, 2018
@davidsbailey davidsbailey deleted the merge_bugbash_changes_to_staging branch November 21, 2018 19:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant