Merge branch 'master' into budget

spec/support/common_actions.rb

@@ -25,7 +25,7 @@ module CommonActions
   end
 
   def login_as_authenticated_manager
-    login, user_key, date = "JJB042", "31415926", Time.now.strftime("%Y%m%d%H%M%S")
+    login, user_key, date = "JJB042", "31415926", Time.current.strftime("%Y%m%d%H%M%S")
     allow_any_instance_of(ManagerAuthenticator).to receive(:auth).and_return({login: login, user_key: user_key, date: date}.with_indifferent_access)
     visit management_sign_in_path(login: login, clave_usuario: user_key, fecha_conexion: date)
   end
@@ -164,10 +164,10 @@ module CommonActions
     expect(page).to have_selector('.in-favor a', visible: false)
   end
 
-   def expect_message_you_need_to_sign_in_to_vote_comments
+  def expect_message_you_need_to_sign_in_to_vote_comments
     expect(page).to have_content 'You must Sign in or Sign up to vote'
-    expect(page).to have_selector('.logged', visible: false)
-    expect(page).to have_selector('.not-logged', visible: true)
+    expect(page).to have_selector('.participation-allowed', visible: false)
+    expect(page).to have_selector('.participation-not-allowed', visible: true)
   end
 
   def expect_message_to_many_anonymous_votes
@@ -213,6 +213,16 @@ module CommonActions
      create(:debate, :with_confidence_score, cached_votes_up: 80)]
   end
 
+  def create_successfull_proposals
+    [create(:proposal, title: "Winter is coming", question: "Do you speak it?", cached_votes_up: Proposal.votes_needed_for_success + 100),
+     create(:proposal, title: "Fire and blood", question: "You talking to me?", cached_votes_up: Proposal.votes_needed_for_success + 1)]
+  end
+
+  def create_archived_proposals
+    [create(:proposal, title: "This is an expired proposal", created_at: Setting["months_to_archive_proposals"].to_i.months.ago),
+     create(:proposal, title: "This is an oldest expired proposal", created_at: (Setting["months_to_archive_proposals"].to_i + 2).months.ago)]
+  end
+
   def tag_names(tag_cloud)
     tag_cloud.tags.map(&:name)
   end

spec/support/locales/custom/en.yml

@@ -0,0 +1,5 @@
+---
+en:
+  account:
+    show:
+      change_credentials_link: Overriden string with custom locales

spec/support/locales/en.yml

@@ -0,0 +1,5 @@
+---
+en:
+  account:
+    show:
+      change_credentials_link: Not overriden string with custom locales

spec/support/verifiable.rb

@@ -4,7 +4,7 @@ shared_examples_for "verifiable" do
   describe "#scopes" do
     describe "#level_three_verified" do
       it "returns level three verified users" do
-        user1 = create(:user, verified_at: Time.now)
+        user1 = create(:user, verified_at: Time.current)
         user2 = create(:user, verified_at: nil)
 
         expect(model.level_three_verified).to include(user1)
@@ -14,10 +14,10 @@ shared_examples_for "verifiable" do
 
     describe "#level_two_verified" do
       it "returns level two verified users" do
-        user1 = create(:user, confirmed_phone: "123456789", residence_verified_at: Time.now)
+        user1 = create(:user, confirmed_phone: "123456789", residence_verified_at: Time.current)
         user2 = create(:user, confirmed_phone: "123456789", residence_verified_at: nil)
-        user3 = create(:user, confirmed_phone: nil, residence_verified_at: Time.now)
-        user4 = create(:user, level_two_verified_at: Time.now)
+        user3 = create(:user, confirmed_phone: nil, residence_verified_at: Time.current)
+        user4 = create(:user, level_two_verified_at: Time.current)
 
         expect(model.level_two_verified).to include(user1)
         expect(model.level_two_verified).to_not include(user2)
@@ -28,11 +28,11 @@ shared_examples_for "verifiable" do
 
     describe "#level_two_or_three_verified" do
       it "returns level two or three verified users" do
-        user1 = create(:user, confirmed_phone: "123456789", residence_verified_at: Time.now)
-        user2 = create(:user, verified_at: Time.now)
+        user1 = create(:user, confirmed_phone: "123456789", residence_verified_at: Time.current)
+        user2 = create(:user, verified_at: Time.current)
         user3 = create(:user, confirmed_phone: "123456789", residence_verified_at: nil)
-        user4 = create(:user, confirmed_phone: nil, residence_verified_at: Time.now)
-        user5 = create(:user, level_two_verified_at: Time.now)
+        user4 = create(:user, confirmed_phone: nil, residence_verified_at: Time.current)
+        user5 = create(:user, level_two_verified_at: Time.current)
 
         expect(model.level_two_or_three_verified).to include(user1)
         expect(model.level_two_or_three_verified).to include(user2)
@@ -46,9 +46,9 @@ shared_examples_for "verifiable" do
       it "returns unverified users" do
         user1 = create(:user, verified_at: nil, confirmed_phone: nil)
         user2 = create(:user, verified_at: nil, residence_verified_at: nil, confirmed_phone: "123456789")
-        user3 = create(:user, verified_at: nil, residence_verified_at: Time.now, confirmed_phone: nil)
-        user4 = create(:user, verified_at: Time.now, residence_verified_at: Time.now, confirmed_phone: "123456789")
-        user5 = create(:user, level_two_verified_at: Time.now)
+        user3 = create(:user, verified_at: nil, residence_verified_at: Time.current, confirmed_phone: nil)
+        user4 = create(:user, verified_at: Time.current, residence_verified_at: Time.current, confirmed_phone: "123456789")
+        user5 = create(:user, level_two_verified_at: Time.current)
 
         expect(model.unverified).to include(user1)
         expect(model.unverified).to include(user2)
@@ -63,9 +63,9 @@ shared_examples_for "verifiable" do
         user1 = create(:user, verified_at: nil, confirmed_phone: nil)
         create(:failed_census_call, user: user1)
 
-        user2 = create(:user, verified_at: nil, residence_verified_at: Time.now, unconfirmed_phone: nil)
+        user2 = create(:user, verified_at: nil, residence_verified_at: Time.current, unconfirmed_phone: nil)
         user3 = create(:user, verified_at: nil, confirmed_phone: nil)
-        user4 = create(:user, verified_at: Time.now, residence_verified_at: Time.now, unconfirmed_phone: "123456789", confirmed_phone: "123456789")
+        user4 = create(:user, verified_at: Time.current, residence_verified_at: Time.current, unconfirmed_phone: "123456789", confirmed_phone: "123456789")
 
 
         expect(model.incomplete_verification).to include(user1)
@@ -78,7 +78,7 @@ shared_examples_for "verifiable" do
 
   describe "#methods" do
     it "residence_verified? is true only if residence_verified_at" do
-      user = create(:user, residence_verified_at: Time.now)
+      user = create(:user, residence_verified_at: Time.current)
       expect(user.residence_verified?).to eq(true)
 
       user = create(:user, residence_verified_at: nil)
@@ -94,13 +94,13 @@ shared_examples_for "verifiable" do
     end
 
     it "level_two_verified? is true if manually set, or if residence_verified_at and confirmed_phone" do
-      user = create(:user, level_two_verified_at: Time.now)
+      user = create(:user, level_two_verified_at: Time.current)
       expect(user.level_two_verified?).to eq(true)
 
-      user = create(:user, confirmed_phone: "123456789", residence_verified_at: Time.now)
+      user = create(:user, confirmed_phone: "123456789", residence_verified_at: Time.current)
       expect(user.level_two_verified?).to eq(true)
 
-      user = create(:user, confirmed_phone: nil, residence_verified_at: Time.now)
+      user = create(:user, confirmed_phone: nil, residence_verified_at: Time.current)
       expect(user.level_two_verified?).to eq(false)
 
       user = create(:user, confirmed_phone: "123456789", residence_verified_at: nil)
@@ -108,7 +108,7 @@ shared_examples_for "verifiable" do
     end
 
     it "level_three_verified? is true only if verified_at" do
-      user = create(:user, verified_at: Time.now)
+      user = create(:user, verified_at: Time.current)
       expect(user.level_three_verified?).to eq(true)
 
       user = create(:user, verified_at: nil)
@@ -119,7 +119,7 @@ shared_examples_for "verifiable" do
       user = create(:user, verified_at: nil, confirmed_phone: nil)
       expect(user.unverified?).to eq(true)
 
-      user = create(:user, verified_at: Time.now, confirmed_phone: "123456789", residence_verified_at: Time.now)
+      user = create(:user, verified_at: Time.current, confirmed_phone: "123456789", residence_verified_at: Time.current)
       expect(user.unverified?).to eq(false)
     end
 
@@ -146,17 +146,18 @@ shared_examples_for "verifiable" do
     end
 
     it "verification_letter_sent? is true only if user has letter_requested_at and letter_verification_code" do
-      user = create(:user, letter_requested_at: Time.now, letter_verification_code: "666")
+      user = create(:user, letter_requested_at: Time.current, letter_verification_code: "666")
       expect(user.verification_letter_sent?).to eq(true)
 
       user = create(:user, letter_requested_at: nil, letter_verification_code: "666")
       expect(user.verification_letter_sent?).to eq(false)
 
-      user = create(:user, letter_requested_at: Time.now, letter_verification_code: nil)
+      user = create(:user, letter_requested_at: Time.current, letter_verification_code: nil)
       expect(user.verification_letter_sent?).to eq(false)
 
       user = create(:user, letter_requested_at: nil, letter_verification_code: nil)
       expect(user.verification_letter_sent?).to eq(false)
     end
   end
-end
+
+end