Skip to content

Commit c933ba8

Browse files
author
Matt Swanson
committed
swap user for repository in change password command. switch specs to use real model. change AR spec helper to pull from database.yml.
1 parent ad6f1c2 commit c933ba8

8 files changed

Lines changed: 39 additions & 26 deletions

File tree

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1+
require_relative "../../repositories/user_repository"
2+
13
class ChangeUserPassword
2-
def initialize(repository = User)
4+
def initialize(repository = UserRepository)
35
@repo = repository
46
end
57

68
def change_user_password(new_password)
79
user = @repo.first
810
user.password = new_password
9-
user.save
11+
12+
@repo.save(user)
1013
user
1114
end
1215
end

‎app/repositories/user_repository.rb‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,13 @@ def self.fetch(id)
1010
def self.setup_complete?
1111
User.any? && User.first.setup_complete?
1212
end
13+
14+
def self.save(user)
15+
user.save
16+
user
17+
end
18+
19+
def self.first
20+
User.first
21+
end
1322
end

‎app/tasks/change_password.rb‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ def change_password
1515
end
1616

1717
private
18-
1918
def ask_password
2019
ask_hidden("New password: ") do |q|
21-
q.validate = /\A.+\Z/
20+
q.validate = /\A.+\Z/
2221
q.responses[:not_valid] = "The password can't be blank."
2322
end
2423
end

‎config/database.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
development:
22
adapter: sqlite3
3-
database: db/stringer.sqlite
3+
database: db/stringer.sqlite
4+
5+
test:
6+
adapter: sqlite3
7+
database: db/stringer_test.sqlite
Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
11
require "spec_helper"
2+
require "support/active_record"
23

34
app_require "commands/users/change_user_password"
45

56
describe ChangeUserPassword do
6-
let(:repo) do
7-
double("repo")
8-
end
9-
10-
let(:user) do
11-
double("user", id: 1, password_digest: BCrypt::Password.create(old_password))
12-
end
7+
let(:repo) { stub }
8+
let(:user) { User.create(password: old_password) }
139

14-
let(:old_password){ "old-pw" }
15-
let(:new_password){ "new-pw" }
10+
let(:old_password) { "old-pw" }
11+
let(:new_password) { "new-pw" }
1612

1713
describe "#change_user_password" do
1814
it "changes the password of the user" do
15+
repo.should_receive(:first).and_return(user)
16+
repo.should_receive(:save)
17+
1918
command = ChangeUserPassword.new(repo)
20-
21-
repo.should_receive(:first){ user }
22-
user.should_receive(:password=).with(new_password)
23-
user.should_receive(:save)
24-
25-
command.change_user_password(new_password)
19+
result = command.change_user_password(new_password)
20+
21+
BCrypt::Password.new(result.password_digest).should eq new_password
2622
end
2723
end
2824
end

‎spec/models/story_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
require "spec_helper"
2-
require 'support/active_record'
2+
require "support/active_record"
33

44
app_require "models/story"
55

‎spec/support/active_record.rb‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
require 'active_record'
22

3-
ActiveRecord::Base.establish_connection adapter: "sqlite3", database: "db/stringer_test.sqlite"
3+
config = YAML.load(File.read('config/database.yml'))
4+
ActiveRecord::Base.establish_connection(config['test'])
45

56
def need_to_migrate?
67
current_migration = ActiveRecord::Migrator.current_version

‎spec/tasks/change_password_spec.rb‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
require "spec_helper"
2+
23
app_require "tasks/change_password"
34

45
describe ChangePassword do
5-
let(:ui) { double("ui") }
6-
let(:command) { double("command") }
7-
let(:new_password){ "new-pw" }
6+
let(:ui) { double("ui") }
7+
let(:command) { double("command") }
8+
let(:new_password) { "new-pw" }
89

9-
let(:task) { ChangePassword.new(ui, command) }
10+
let(:task) { ChangePassword.new(ui, command) }
1011

1112
describe "#change_password" do
1213
it "invokes command with confirmed password" do

0 commit comments

Comments
 (0)