Commit 5c2be94

mo khan <mo@mokhan.ca>
2016-05-26 00:46:50
let active support load the time zones.
master
1 parent bea596e
Changed files (3)
app
controllers
profiles_controller.rb
views
profiles
edit.html.erb
spec
controllers
profiles_controller_spec.rb
app/controllers/profiles_controller.rb
@@ -8,7 +8,6 @@ class ProfilesController < ApplicationController
   def edit
     @profile = current_user.profile
     @program = Program.stronglifts
-    @time_zones = ActiveSupport::TimeZone.all.sort
   end
 
   def update
app/views/profiles/edit.html.erb
@@ -19,7 +19,7 @@
       </fieldset>
       <fieldset>
         <legend><%= Profile.human_attribute_name(:time_zone) %></legend>
-        <%= f.time_zone_select(:time_zone, @time_zones) %>
+        <%= f.time_zone_select(:time_zone, ActiveSupport::TimeZone.us_zones) %>
       </fieldset>
       <%= f.submit t(".save"), class: "button"  %>
     <% end %>
spec/controllers/profiles_controller_spec.rb
@@ -41,14 +41,6 @@ describe ProfilesController do
         expect(assigns(:profile)).to eql(user.profile)
         expect(assigns(:program)).to eql(Program.stronglifts)
       end
-
-      it "loads all available timezones" do
-        get :edit, id: user.to_param
-        expect(assigns(:time_zones)).
-          to include(ActiveSupport::TimeZone.new("Mountain Time (US & Canada)"))
-        expect(assigns(:time_zones)).
-          to include(ActiveSupport::TimeZone.new("UTC"))
-      end
     end
 
     describe "#update" do