Commit 41c6704

@@ -15,8 +15,11 @@ class Ios::Import
       db.execute("SELECT * FROM ZBASEWORKOUT") do |row|
         workout_name = row[5] == 1 ? "A" : "B"
         workout = program.workouts.find_by(name: workout_name)
-        training_session = user.
-          begin_workout(workout, DateTime.parse(row[8]), row[7].to_f)
+        training_session = user.begin_workout(
+          workout,
+          DateTime.parse(row[8]),
+          row[7].to_f
+        )
 
         workout_id = row[0]
         db.execute("SELECT * FROM ZEXERCISESETS WHERE ZWORKOUT = '#{workout_id}';") do |exercise_set_row|

@@ -15,7 +15,7 @@ class TrainingSession < ActiveRecord::Base
 
   def progress_for(exercise)
     exercise_sessions.
-      joins(:exercise_workout => :exercise).
-      find_by(exercise_workouts: {exercise_id: exercise.id})
+      joins(exercise_workout: :exercise).
+      find_by(exercise_workouts: { exercise_id: exercise.id })
   end
 end

@@ -16,7 +16,8 @@ feature "Profiles", type: :feature do
     end
 
     it "displays the number of workouts completed" do
-      expect(page).to have_content(I18n.translate("profiles.show.no_workouts_completed"))
+      translations = I18n.translate("profiles.show.no_workouts_completed")
+      expect(page).to have_content(translations)
     end
   end
 end

@@ -7,7 +7,7 @@ describe Android::Import do
 
   describe "#import_from" do
     let(:directory) { Dir.mktmpdir }
-    let(:backup_file) do 
+    let(:backup_file) do
       Rails.root.join("spec", "fixtures", "backup.android.stronglifts")
     end
 

@@ -27,7 +27,9 @@ describe Ios::Import do
 
   describe "#import_from" do
     let(:directory) { Dir.mktmpdir }
-    let(:backup_file) { Rails.root.join("spec", "fixtures", "backup.ios.stronglifts") }
+    let(:backup_file) do 
+      Rails.root.join("spec", "fixtures", "backup.ios.stronglifts")
+    end
 
     before :each do
       `unzip #{backup_file} -d #{directory}`

@@ -37,6 +37,7 @@ gem 'scale'
 gem 'dotenv-rails'
 gem 'chartkick'
 gem 'groupdate'
+gem 'dalli'
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console

@@ -90,6 +90,7 @@ GEM
       simplecov (~> 0.9.1)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
+    dalli (2.7.4)
     database_cleaner (1.4.1)
     debug_inspector (0.0.2)
     descendants_tracker (0.0.4)
@@ -334,6 +335,7 @@ DEPENDENCIES
   chartkick
   coffee-rails (~> 4.1.0)
   coveralls
+  dalli
   database_cleaner
   dotenv-rails
   email_validator