Commit 92bde33

@@ -6,9 +6,7 @@ feature "Programs", type: :feature do
   let(:user) { create(:user, password: "password") }
 
   before :each do
-    login_page = LoginPage.new
-    login_page.visit_page
-    login_page.login_with(user.username, "password")
+    subject.login_with(user.username, "password")
     subject.visit_page
   end
 

@@ -7,9 +7,7 @@ feature "Training Sessions", type: :feature do
   let!(:training_session) { create(:training_session, user: user, workout: workout_a, occurred_at: DateTime.now, body_weight: 210.0) }
 
   before :each do
-    login_page = LoginPage.new
-    login_page.visit_page
-    login_page.login_with(user.username, "password")
+    subject.login_with(user.username, "password")
     subject.visit_page
   end
 

@@ -46,7 +46,7 @@ describe Ios::Import do
 
     it "imports each training session" do
       subject.import_from(directory)
-      first_exercises = user.training_sessions.first.exercise_sessions
+      first_exercises = user.training_sessions.order(:occurred_at).first.exercise_sessions
       expect(first_exercises.count).to eql(3)
       expect(first_exercises.first.sets).to eql(["5", "5", "5", "5", "5"])
     end

@@ -18,7 +18,7 @@ describe TrainingSession, type: :model do
       expect(result).to be_persisted
       expect(result.target_weight).to eql(target_weight.to_f)
       expect(result.exercise).to eql(squat)
-      expect(result.sets).to eql(sets.map { |x| x.to_s })
+      expect(result.sets).to eql(sets.map(&:to_s))
     end
   end
 

@@ -2,6 +2,6 @@ require_relative "../page_model.rb"
 
 class ProfilePage < PageModel
   def initialize(user)
-    super profile_path(id: user.to_param)
+    super profile_path(user)
   end
 end