From b13ffe2d32e3d067c6f84fac38a65079b013b687 Mon Sep 17 00:00:00 2001 From: Seth Call Date: Thu, 21 Apr 2016 15:29:40 -0500 Subject: [PATCH] Refresh user after booking --- ...BookLessonFree.js.jsx.coffee => BookLesson.js.jsx.coffee} | 1 + .../TeacherSearchOptionsScreen.js.jsx.coffee | 2 +- .../react-components/TeacherSearchScreen.js.jsx.coffee | 2 +- .../{BookLessonFree.css.scss => BookLesson.css.scss} | 0 web/app/views/clients/index.html.erb | 2 +- .../{_book_lesson_free.html.slim => _book_lesson.html.slim} | 0 web/spec/features/book_test_drive_spec.rb | 5 +++-- 7 files changed, 7 insertions(+), 5 deletions(-) rename web/app/assets/javascripts/react-components/{BookLessonFree.js.jsx.coffee => BookLesson.js.jsx.coffee} (99%) rename web/app/assets/stylesheets/client/react-components/{BookLessonFree.css.scss => BookLesson.css.scss} (100%) rename web/app/views/clients/jamclass/{_book_lesson_free.html.slim => _book_lesson.html.slim} (100%) diff --git a/web/app/assets/javascripts/react-components/BookLessonFree.js.jsx.coffee b/web/app/assets/javascripts/react-components/BookLesson.js.jsx.coffee similarity index 99% rename from web/app/assets/javascripts/react-components/BookLessonFree.js.jsx.coffee rename to web/app/assets/javascripts/react-components/BookLesson.js.jsx.coffee index e0ed48dd6..431f1ee98 100644 --- a/web/app/assets/javascripts/react-components/BookLessonFree.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/BookLesson.js.jsx.coffee @@ -227,6 +227,7 @@ UserStore = context.UserStore booked: (response) -> @setState({updating: false}) + UserActions.refresh() if response.user['has_stored_credit_card?'] context.location = "/client#/jamclass/lesson-booking/#{response.id}" else diff --git a/web/app/assets/javascripts/react-components/TeacherSearchOptionsScreen.js.jsx.coffee b/web/app/assets/javascripts/react-components/TeacherSearchOptionsScreen.js.jsx.coffee index 9a0d77fb1..4c20d0e2e 100644 --- a/web/app/assets/javascripts/react-components/TeacherSearchOptionsScreen.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/TeacherSearchOptionsScreen.js.jsx.coffee @@ -132,7 +132,7 @@ LocationActions = @LocationActions
CANCEL - SEARCH + SEARCH
` }) \ No newline at end of file diff --git a/web/app/assets/javascripts/react-components/TeacherSearchScreen.js.jsx.coffee b/web/app/assets/javascripts/react-components/TeacherSearchScreen.js.jsx.coffee index 0a2273705..a21daafc3 100644 --- a/web/app/assets/javascripts/react-components/TeacherSearchScreen.js.jsx.coffee +++ b/web/app/assets/javascripts/react-components/TeacherSearchScreen.js.jsx.coffee @@ -258,7 +258,7 @@ ProfileActions = @ProfileActions
JamKazam Home :  JamClass Home :  - Teachers Search :  + Teachers Search :  Search Results / {searchDesc} diff --git a/web/app/assets/stylesheets/client/react-components/BookLessonFree.css.scss b/web/app/assets/stylesheets/client/react-components/BookLesson.css.scss similarity index 100% rename from web/app/assets/stylesheets/client/react-components/BookLessonFree.css.scss rename to web/app/assets/stylesheets/client/react-components/BookLesson.css.scss diff --git a/web/app/views/clients/index.html.erb b/web/app/views/clients/index.html.erb index be0999f7c..297594f77 100644 --- a/web/app/views/clients/index.html.erb +++ b/web/app/views/clients/index.html.erb @@ -46,7 +46,7 @@ <%= render "clients/teachers/profile/profile" %> <%= render "clients/teachers/search/search_options" %> <%= render "clients/teachers/search/search_results" %> -<%= render "clients/jamclass/book_lesson_free" %> +<%= render "clients/jamclass/book_lesson" %> <%= render "clients/jamclass/lesson_payment" %> <%= render "clients/jamclass/lesson_session" %> <%= render "clients/jamclass/lesson_booking" %> diff --git a/web/app/views/clients/jamclass/_book_lesson_free.html.slim b/web/app/views/clients/jamclass/_book_lesson.html.slim similarity index 100% rename from web/app/views/clients/jamclass/_book_lesson_free.html.slim rename to web/app/views/clients/jamclass/_book_lesson.html.slim diff --git a/web/spec/features/book_test_drive_spec.rb b/web/spec/features/book_test_drive_spec.rb index 146d00ca2..ecbf4e627 100644 --- a/web/spec/features/book_test_drive_spec.rb +++ b/web/spec/features/book_test_drive_spec.rb @@ -104,14 +104,15 @@ describe "Test Drive", :js => true, :type => :feature, :capybara_feature => true # let's make sure we can ask for another test drive too! - teacher_user2.teacher.ready_for_session_at = Time.now teacher_user2.teacher.save! + visit "/client#/teachers/search" + find('a.teacher-search-options').trigger(:click) + find('a.search-btn').trigger(:click) find('.teacher-search-result[data-teacher-id="' + teacher_user2.id + '"] .try-test-drive').trigger(:click) - visit "/client#/teachers/search" find('h2', text: 'book testdrive lesson') find('.booking-info', text: '3 TestDrive lesson credits')