From 7bf57b05f30d78dae8c7239acb2cf4be81fc4a80 Mon Sep 17 00:00:00 2001 From: Michael Ball Date: Wed, 29 Jan 2020 16:51:27 -0800 Subject: [PATCH] Cleanup specs --- app/views/payments/_payment.html.haml | 17 ++++++++++++----- spec/features/conference_spec.rb | 3 ++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/app/views/payments/_payment.html.haml b/app/views/payments/_payment.html.haml index 56af80f7..ff27e2ba 100644 --- a/app/views/payments/_payment.html.haml +++ b/app/views/payments/_payment.html.haml @@ -1,6 +1,6 @@ .div .col-md-12.table-responsive - %table.table.table-hover + %table.table.table-hover.table-striped %thead %tr %th Ticket @@ -21,7 +21,14 @@ = form_tag conference_payments_path do %script.stripe-button{ src: "https://checkout.stripe.com/checkout.js", - data: { amount: @total_amount_to_pay.cents, label: "Pay #{humanized_money_with_symbol @total_amount_to_pay}", - email: current_user.email, currency: @total_amount_to_pay.currency, name: ENV['OSEM_NAME'] || 'OSEM', - description: "book your tickets", key: Rails.application.secrets.stripe_publishable_key, locale: "auto"}} - = link_to 'Edit Purchase', conference_tickets_path(@conference.short_title), class: 'btn btn-default' + data: { + amount: @total_amount_to_pay.cents, + label: "Pay #{humanized_money_with_symbol @total_amount_to_pay}", + email: current_user.email, + currency: @total_amount_to_pay.currency, + name: ENV['OSEM_NAME'] || 'OSEM', + description: "#{OSEM_NAME} tickets", + key: ENV['STRIPE_PUBLISHABLE_KEY'] || Rails.application.secrets.stripe_publishable_key, locale: "auto" + }} + = link_to('Edit Purchase', conference_tickets_path(@conference.short_title), + class: 'btn btn-default') diff --git a/spec/features/conference_spec.rb b/spec/features/conference_spec.rb index 95f422bc..f995540e 100644 --- a/spec/features/conference_spec.rb +++ b/spec/features/conference_spec.rb @@ -98,7 +98,8 @@ feature Conference do sign_in user visit admin_conference_path(conference.short_title) - expect(find('.navbar-brand').text).to eq(conference.organization.name) + # expect(find('.navbar-brand')).to eq(conference.organization.name) + expect(find('.navbar-brand')).to eq(image_tag('snapcon_logo.png')) end it_behaves_like 'add and update conference'