diff --git a/web/app/assets/stylesheets/client/jamkazam.css.scss b/web/app/assets/stylesheets/client/jamkazam.css.scss index eac86bc3e..2a2df361e 100644 --- a/web/app/assets/stylesheets/client/jamkazam.css.scss +++ b/web/app/assets/stylesheets/client/jamkazam.css.scss @@ -67,6 +67,7 @@ a.arrow-down { select { padding:3px; font-size:15px; + border-radius: 6px; } form .body { diff --git a/web/app/views/shared/_ga.html.erb b/web/app/views/shared/_ga.html.erb index 00992c96c..b1c147703 100644 --- a/web/app/views/shared/_ga.html.erb +++ b/web/app/views/shared/_ga.html.erb @@ -26,4 +26,10 @@ }); })(window); +<% else %> + <% end %> \ No newline at end of file diff --git a/web/spec/features/admin_spec.rb b/web/spec/features/admin_spec.rb new file mode 100644 index 000000000..19145d17e --- /dev/null +++ b/web/spec/features/admin_spec.rb @@ -0,0 +1,33 @@ +require 'spec_helper' + +# this test currently amounts to the barest of smoke tests; log in, see the home screen, and click a tile +# https://jamkazam.atlassian.net/browse/VRFS-749 broke even this simple functionality +describe "Admin", :js => true, :type => :feature, :capybara_feature => true do + + subject { page } + + before(:all) do + Capybara.javascript_driver = :poltergeist + Capybara.current_driver = Capybara.javascript_driver + Capybara.default_wait_time = 10 + end + + let(:user) { FactoryGirl.create(:admin) } + + before(:each) do + UserMailer.deliveries.clear + sign_in_poltergeist user + visit "/" + find('h2', text: 'musicians') + end + + describe "click musician tile" do + + before(:each) do + find("div.homecard.musicians").trigger(:click) + end + + it { should have_selector('h1', text: 'musicians' ) } + end +end +