Commit dff9f48
Changed files (5)
app
controllers
models
spec
app/controllers/training_sessions_controller.rb
@@ -7,10 +7,11 @@ class TrainingSessionsController < ApplicationController
end
def upload
- UploadStrongliftsBackupJob.perform_later(current_user,
- storage.store(params[:backup]),
- Program.stronglifts
- )
+ UploadStrongliftsBackupJob.perform_later(
+ current_user,
+ storage.store(params[:backup]),
+ Program.stronglifts
+ )
redirect_to dashboard_path, notice: t(".success")
end
app/models/program.rb
@@ -1,5 +1,5 @@
class Program < ActiveRecord::Base
- STRONG_LIFTS="StrongLifts 5×5"
+ STRONG_LIFTS = "StrongLifts 5×5"
has_many :exercises, through: :workouts
has_many :workouts
before_save :save_slug
app/models/user.rb
@@ -17,7 +17,11 @@ class User < ActiveRecord::Base
end
def personal_record(exercise)
- exercise_sessions.joins(:exercise).where(exercises: { name: exercise.name }).pluck(:target_weight).max
+ exercise_sessions.
+ joins(:exercise).
+ where(exercises: { name: exercise.name }).
+ pluck(:target_weight).
+ max
end
def self.authenticate(username,password)
spec/jobs/upload_stronglifts_backup_job_spec.rb
@@ -1,4 +1,4 @@
-require 'rails_helper'
+require "rails_helper"
describe UploadStrongliftsBackupJob, type: :job do
include_context "stronglifts_program"
@@ -6,7 +6,9 @@ describe UploadStrongliftsBackupJob, type: :job do
describe "#perform" do
context "android backup" do
- let(:backup_file) { Rails.root.join("spec", "fixtures", "android-backup.stronglifts").to_s }
+ let(:backup_file) do
+ Rails.root.join("spec", "fixtures", "android-backup.stronglifts").to_s
+ end
it "adds each workout to the list of training sessions for the user" do
subject.perform(user, backup_file, program)
spec/models/training_session_spec.rb
@@ -35,16 +35,20 @@ describe TrainingSession, type: :model do
end
it 'creates a new workout' do
- training_session = user.training_sessions.create_workout_from(workout_row, program)
+ training_session = user.training_sessions.
+ create_workout_from(workout_row, program)
expect(training_session).to be_persisted
expect(training_session.occurred_at).to eql(workout_row.date)
expect(training_session.workout).to eql(workout_a)
expect(training_session.body_weight).to eql(209.0)
expect(training_session.exercise_sessions.count).to eql(3)
- expect(training_session.exercise_sessions.map { |x| x.exercise.name }).to match_array(["Squat", "Bench Press", "Barbell Row"])
+ expect(
+ training_session.exercise_sessions.map { |x| x.exercise.name }
+ ).to match_array(["Squat", "Bench Press", "Barbell Row"])
- squat_session = training_session.exercise_sessions.find_by(exercise_workout: squat_workout)
+ squat_session = training_session.exercise_sessions.
+ find_by(exercise_workout: squat_workout)
expect(squat_session.target_weight).to eql(200.0)
expect(squat_session.sets[0]).to eql('0')
expect(squat_session.sets[1]).to eql('0')
@@ -52,7 +56,8 @@ describe TrainingSession, type: :model do
expect(squat_session.sets[3]).to eql('0')
expect(squat_session.sets[4]).to eql('0')
- bench_session = training_session.exercise_sessions.find_by(exercise_workout: bench_workout)
+ bench_session = training_session.exercise_sessions.
+ find_by(exercise_workout: bench_workout)
expect(bench_session.target_weight).to eql(145.0)
expect(bench_session.sets[0]).to eql("5")
expect(bench_session.sets[1]).to eql("5")
@@ -60,7 +65,8 @@ describe TrainingSession, type: :model do
expect(bench_session.sets[3]).to eql("5")
expect(bench_session.sets[4]).to eql("5")
- row_session = training_session.exercise_sessions.find_by(exercise_workout: row_workout)
+ row_session = training_session.exercise_sessions.
+ find_by(exercise_workout: row_workout)
expect(row_session.target_weight).to eql(130.0)
expect(row_session.sets[0]).to eql("5")
expect(row_session.sets[1]).to eql("4")
@@ -70,8 +76,11 @@ describe TrainingSession, type: :model do
end
it 'excludes items that have already been imported' do
- training_session = user.training_sessions.create_workout_from(workout_row, program)
- expect(user.training_sessions.create_workout_from(workout_row, program)).to eql(training_session)
+ training_session = user.training_sessions.
+ create_workout_from(workout_row, program)
+ expect(
+ user.training_sessions.create_workout_from(workout_row, program)
+ ).to eql(training_session)
end
end
end