Check if updated_at of asciicasts and api tokens is touched when merging users

footer-fixes
Marcin Kulik 10 years ago
parent 5d2f53a259
commit c0d4f28b2f

@ -45,6 +45,7 @@ group :test, :development do
gem 'rspec-rails', '~> 3.0.0.beta1'
gem 'cane', '~> 2.5.2'
gem 'jasmine-rails', '~> 0.4.5'
gem 'timecop', '~> 0.7.1'
end
group :test do

@ -312,6 +312,7 @@ GEM
thread_safe (0.1.3)
atomic
tilt (1.4.1)
timecop (0.7.1)
timers (1.1.0)
tins (0.13.1)
treetop (1.4.15)
@ -389,6 +390,7 @@ DEPENDENCIES
spring
spring-commands-rspec
thin (~> 1.5.0)
timecop (~> 0.7.1)
uglifier (>= 2.3.1)
unicorn (~> 4.7)
unicorn-worker-killer (~> 0.4.2)

@ -299,9 +299,12 @@ describe User do
let!(:api_token_2) { create(:api_token, user: user) }
let!(:asciicast_1) { create(:asciicast, user: user) }
let!(:asciicast_2) { create(:asciicast, user: user) }
let(:updated_at) { 1.hour.from_now }
before do
subject
Timecop.freeze(updated_at) do
subject
end
end
it "reassigns all user api tokens to the target user" do
@ -310,6 +313,8 @@ describe User do
expect(api_token_1.user).to eq(target_user)
expect(api_token_2.user).to eq(target_user)
expect(api_token_1.updated_at.to_i).to eq(updated_at.to_i)
expect(api_token_2.updated_at.to_i).to eq(updated_at.to_i)
end
it "reassigns all user asciicasts to the target user" do
@ -318,6 +323,8 @@ describe User do
expect(asciicast_1.user).to eq(target_user)
expect(asciicast_2.user).to eq(target_user)
expect(asciicast_1.updated_at.to_i).to eq(updated_at.to_i)
expect(asciicast_2.updated_at.to_i).to eq(updated_at.to_i)
end
it "removes the source user" do

Loading…
Cancel
Save