Commit 81bb93f

mo khan <mo@mokhan.ca>
2016-06-25 16:46:20
always connect via ssl.
master
1 parent 10fe7a1
Changed files (4)
app
assets
javascripts
views
workout_view.js.coffee
views
layouts
application.html.erb
public.html.erb
spec
rails_helper.rb
app/assets/javascripts/views/workout_view.js.coffee
@@ -26,7 +26,7 @@ class Stronglifters.WorkoutView extends Ractive
       type: 'patch',
       contentType: 'application/json',
       data: JSON.stringify(payload),
-      success: (data, statux, xhr) =>
+      success: (data, statux, xhr) ->
         console.log("Saved: #{data}")
       error: (xhr, status, error) ->
         console.log(error)
app/views/layouts/application.html.erb
@@ -7,10 +7,10 @@
     <%= stylesheet_link_tag    "application" %>
     <%= javascript_include_tag "vendor/modernizr" %>
     <%= javascript_include_tag "application" %>
-    <%= javascript_include_tag "//www.google.com/jsapi", "chartkick" %>
-    <%= javascript_include_tag "//apis.google.com/js/api.js" %>
-    <%= javascript_include_tag "//apis.google.com/js/client.js" %>
-    <%= javascript_include_tag "//maps.googleapis.com/maps/api/js" %>
+    <%= javascript_include_tag "https://www.google.com/jsapi", "chartkick" %>
+    <%= javascript_include_tag "https://apis.google.com/js/api.js" %>
+    <%= javascript_include_tag "https://apis.google.com/js/client.js" %>
+    <%= javascript_include_tag "https://maps.googleapis.com/maps/api/js" %>
     </script>
     <%= csrf_meta_tags %>
   </head>
app/views/layouts/public.html.erb
@@ -7,7 +7,6 @@
     <%= stylesheet_link_tag "application" %>
     <%= javascript_include_tag "vendor/modernizr" %>
     <%= javascript_include_tag "application" %>
-    <%= javascript_include_tag "//www.google.com/jsapi", "chartkick" %>
     <%= csrf_meta_tags %>
   </head>
   <body class="<%= controller_name %> <%= action_name %>">
spec/rails_helper.rb
@@ -52,12 +52,14 @@ RSpec.configure do |config|
   config.before(:each, js: true) do
     DatabaseCleaner.strategy = :truncation
     page.driver.browser.url_blacklist = [
-      "http://apis.google.com",
+      "https://apis.google.com",
       "http://fonts.googleapis.com",
-      "http://www.google.com",
+      "https://www.google.com",
       "https://accounts.google.com",
       "https://maps.google.com",
+      "https://s.ytimg.com",
       "https://secure.gravatar.com",
+      "https://www.youtube-nocookie.com",
     ]
   end