Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Update Gemfile. #38

Merged
merged 13 commits into from

2 participants

@archSeer

sqlite3 gem has renamed from sqlite3-ruby to sqlite3. Other gems updated to newer versions.

@matiaskorhonen matiaskorhonen merged commit ec9368a into kiskolabs:master
@matiaskorhonen

Thanks!

@archSeer

No problem, once I get the simple_form updated, I'll push that too :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Dec 8, 2012
  1. Update the sqlite3 gem reference.

    Blaž Hrastnik authored
  2. Update rails to 3.2.9.

    Blaž Hrastnik authored
  3. Update kaminari gem to 0.14.1.

    Blaž Hrastnik authored
  4. Update kronic to 1.1.3.

    Blaž Hrastnik authored
  5. Update nokogiri to 1.5.5.

    Blaž Hrastnik authored
  6. Update RedCloth to 4.2.9

    Blaž Hrastnik authored
  7. Update thin and validates_timeliness

    Blaž Hrastnik authored
  8. Update to devise 2.1.2

    Blaž Hrastnik authored
  9. Update specs to create users with 8 char passwords.

    Blaž Hrastnik authored
  10. Newest devise uses DELETE to send logouts.

    Blaž Hrastnik authored
  11. Update simple_form to 2.0.4

    Blaž Hrastnik authored
Commits on Dec 9, 2012
  1. Revert "Update simple_form to 2.0.4"

    Blaž Hrastnik authored
    This reverts commit baa3a6ed498f758e4619f78f9082baea339a1d12.
This page is out of date. Refresh to see the latest.
View
18 Gemfile
@@ -1,21 +1,21 @@
source "https://rubygems.org"
-gem "rails", "3.2.6"
+gem "rails", "3.2.9"
-gem "devise", "~> 1.5.3"
+gem "devise", "~> 2.1.2"
gem "foreman", "~> 0.51.0"
gem "haml", "~> 3.1.6"
gem "haml-rails"
gem "jquery-rails"
-gem "kaminari", "~> 0.13.0"
-gem "kronic", "~> 1.1.1"
-gem "nokogiri", "~> 1.4.4"
+gem "kaminari", "~> 0.14.1"
+gem "kronic", "~> 1.1.3"
+gem "nokogiri", "~> 1.5.5"
gem "rake"
-gem "RedCloth", "~> 4.2.3"
+gem "RedCloth", "~> 4.2.9"
gem "simple_form", "~> 1.2.2"
-gem "validates_timeliness", "~> 3.0.0"
+gem "validates_timeliness", "~> 3.0.14"
gem "yajl-ruby"
-gem "thin", "~> 1.4.1"
+gem "thin", "~> 1.5.0"
# Gems used only for assets and not required
# in production environments by default.
@@ -27,7 +27,7 @@ group :assets do
end
group :development do
- gem "sqlite3-ruby", :require => "sqlite3"
+ gem "sqlite3"
end
group :production do
View
197 Gemfile.lock
@@ -2,44 +2,44 @@ GEM
remote: https://rubygems.org/
specs:
RedCloth (4.2.9)
- ZenTest (4.8.1)
- actionmailer (3.2.6)
- actionpack (= 3.2.6)
+ ZenTest (4.8.3)
+ actionmailer (3.2.9)
+ actionpack (= 3.2.9)
mail (~> 2.4.4)
- actionpack (3.2.6)
- activemodel (= 3.2.6)
- activesupport (= 3.2.6)
+ actionpack (3.2.9)
+ activemodel (= 3.2.9)
+ activesupport (= 3.2.9)
builder (~> 3.0.0)
erubis (~> 2.7.0)
- journey (~> 1.0.1)
+ journey (~> 1.0.4)
rack (~> 1.4.0)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
- sprockets (~> 2.1.3)
- activemodel (3.2.6)
- activesupport (= 3.2.6)
+ sprockets (~> 2.2.1)
+ activemodel (3.2.9)
+ activesupport (= 3.2.9)
builder (~> 3.0.0)
- activerecord (3.2.6)
- activemodel (= 3.2.6)
- activesupport (= 3.2.6)
+ activerecord (3.2.9)
+ activemodel (= 3.2.9)
+ activesupport (= 3.2.9)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
- activeresource (3.2.6)
- activemodel (= 3.2.6)
- activesupport (= 3.2.6)
- activesupport (3.2.6)
+ activeresource (3.2.9)
+ activemodel (= 3.2.9)
+ activesupport (= 3.2.9)
+ activesupport (3.2.9)
i18n (~> 0.6)
multi_json (~> 1.0)
- addressable (2.2.8)
+ addressable (2.3.2)
akephalos (0.2.5)
capybara (~> 0.4.0)
jruby-jars
arel (3.0.2)
autotest (4.4.6)
ZenTest (>= 4.4.1)
- awesome_print (1.0.2)
+ awesome_print (1.1.0)
bcrypt-ruby (3.0.1)
- builder (3.0.0)
+ builder (3.0.4)
capybara (0.4.1.2)
celerity (>= 0.7.9)
culerity (>= 0.2.4)
@@ -50,149 +50,152 @@ GEM
selenium-webdriver (>= 0.0.27)
xpath (~> 0.1.3)
celerity (0.9.2)
- childprocess (0.3.3)
- ffi (~> 1.0.6)
+ childprocess (0.3.6)
+ ffi (~> 1.0, >= 1.0.6)
coffee-rails (3.2.2)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
coffee-script (2.2.0)
coffee-script-source
execjs
- coffee-script-source (1.3.3)
+ coffee-script-source (1.4.0)
culerity (0.2.15)
- daemons (1.1.8)
- database_cleaner (0.8.0)
- devise (1.5.3)
+ daemons (1.1.9)
+ database_cleaner (0.9.1)
+ devise (2.1.2)
bcrypt-ruby (~> 3.0)
- orm_adapter (~> 0.0.3)
- warden (~> 1.1)
+ orm_adapter (~> 0.1)
+ railties (~> 3.1)
+ warden (~> 1.2.1)
diff-lcs (1.1.3)
erubis (2.7.0)
- eventmachine (0.12.10)
+ eventmachine (1.0.0)
execjs (1.4.0)
multi_json (~> 1.0)
- factory_girl (3.5.0)
+ factory_girl (4.1.0)
activesupport (>= 3.0.0)
- factory_girl_rails (3.5.0)
- factory_girl (~> 3.5.0)
+ factory_girl_rails (4.1.0)
+ factory_girl (~> 4.1.0)
railties (>= 3.0.0)
ffaker (1.15.0)
- ffi (1.0.11)
+ ffi (1.2.0)
font-awesome-sass-rails (2.0.0.0)
railties (>= 3.1.1)
sass-rails (>= 3.1.1)
foreman (0.51.0)
thor (>= 0.13.6)
- haml (3.1.6)
- haml-rails (0.3.4)
- actionpack (~> 3.0)
- activesupport (~> 3.0)
- haml (~> 3.0)
- railties (~> 3.0)
+ haml (3.1.7)
+ haml-rails (0.3.5)
+ actionpack (>= 3.1, < 4.1)
+ activesupport (>= 3.1, < 4.1)
+ haml (~> 3.1)
+ railties (>= 3.1, < 4.1)
hike (1.2.1)
- i18n (0.6.0)
+ i18n (0.6.1)
journey (1.0.4)
- jquery-rails (2.0.2)
- railties (>= 3.2.0, < 5.0)
- thor (~> 0.14)
- jruby-jars (1.6.7.2)
- json (1.7.3)
- kaminari (0.13.0)
+ jquery-rails (2.1.4)
+ railties (>= 3.0, < 5.0)
+ thor (>= 0.14, < 2.0)
+ jruby-jars (1.7.1)
+ json (1.7.5)
+ kaminari (0.14.1)
actionpack (>= 3.0.0)
activesupport (>= 3.0.0)
- railties (>= 3.0.0)
kronic (1.1.3)
- launchy (2.1.0)
- addressable (~> 2.2.6)
- libwebsocket (0.1.4)
+ launchy (2.1.2)
+ addressable (~> 2.3)
+ libwebsocket (0.1.7.1)
addressable
+ websocket
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.19)
- multi_json (1.3.6)
- nokogiri (1.4.7)
- orm_adapter (0.0.7)
- pg (0.14.0)
+ multi_json (1.4.0)
+ nokogiri (1.5.5)
+ orm_adapter (0.4.0)
+ pg (0.14.1)
polyglot (0.3.3)
rack (1.4.1)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
rack
- rack-test (0.6.1)
+ rack-test (0.6.2)
rack (>= 1.0)
- rails (3.2.6)
- actionmailer (= 3.2.6)
- actionpack (= 3.2.6)
- activerecord (= 3.2.6)
- activeresource (= 3.2.6)
- activesupport (= 3.2.6)
+ rails (3.2.9)
+ actionmailer (= 3.2.9)
+ actionpack (= 3.2.9)
+ activerecord (= 3.2.9)
+ activeresource (= 3.2.9)
+ activesupport (= 3.2.9)
bundler (~> 1.0)
- railties (= 3.2.6)
- railties (3.2.6)
- actionpack (= 3.2.6)
- activesupport (= 3.2.6)
+ railties (= 3.2.9)
+ railties (3.2.9)
+ actionpack (= 3.2.9)
+ activesupport (= 3.2.9)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
- rake (0.9.2.2)
+ rake (10.0.2)
rdoc (3.12)
json (~> 1.4)
- rspec (2.11.0)
- rspec-core (~> 2.11.0)
- rspec-expectations (~> 2.11.0)
- rspec-mocks (~> 2.11.0)
- rspec-core (2.11.0)
- rspec-expectations (2.11.1)
+ rspec (2.12.0)
+ rspec-core (~> 2.12.0)
+ rspec-expectations (~> 2.12.0)
+ rspec-mocks (~> 2.12.0)
+ rspec-core (2.12.1)
+ rspec-expectations (2.12.0)
diff-lcs (~> 1.1.3)
- rspec-mocks (2.11.1)
- rspec-rails (2.11.0)
+ rspec-mocks (2.12.0)
+ rspec-rails (2.12.0)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
- rspec (~> 2.11.0)
+ rspec-core (~> 2.12.0)
+ rspec-expectations (~> 2.12.0)
+ rspec-mocks (~> 2.12.0)
rubyzip (0.9.9)
- sass (3.1.20)
+ sass (3.2.3)
sass-rails (3.2.5)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- selenium-webdriver (2.24.0)
+ selenium-webdriver (2.27.1)
childprocess (>= 0.2.5)
libwebsocket (~> 0.1.3)
multi_json (~> 1.0)
rubyzip
simple_form (1.2.2)
- sprockets (2.1.3)
+ sprockets (2.2.2)
hike (~> 1.2)
+ multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.6)
- sqlite3-ruby (1.3.3)
- sqlite3 (>= 1.3.3)
steak (1.1.0)
rspec (>= 1.3)
- thin (1.4.1)
+ thin (1.5.0)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
- thor (0.15.4)
+ thor (0.16.0)
tilt (1.3.3)
- timeliness (0.3.6)
- treetop (1.4.10)
+ timeliness (0.3.7)
+ treetop (1.4.12)
polyglot
polyglot (>= 0.3.1)
- tzinfo (0.3.33)
- uglifier (1.2.6)
+ tzinfo (0.3.35)
+ uglifier (1.3.0)
execjs (>= 0.3.0)
- multi_json (~> 1.3)
- validates_timeliness (3.0.12)
+ multi_json (~> 1.0, >= 1.0.2)
+ validates_timeliness (3.0.14)
timeliness (~> 0.3.6)
warden (1.2.1)
rack (>= 1.0)
+ websocket (1.0.4)
xpath (0.1.4)
nokogiri (~> 1.3)
yajl-ruby (1.1.0)
@@ -201,14 +204,14 @@ PLATFORMS
ruby
DEPENDENCIES
- RedCloth (~> 4.2.3)
+ RedCloth (~> 4.2.9)
akephalos
autotest
awesome_print
capybara
coffee-rails (~> 3.2.2)
database_cleaner
- devise (~> 1.5.3)
+ devise (~> 2.1.2)
factory_girl_rails
ffaker
font-awesome-sass-rails
@@ -216,19 +219,19 @@ DEPENDENCIES
haml (~> 3.1.6)
haml-rails
jquery-rails
- kaminari (~> 0.13.0)
- kronic (~> 1.1.1)
+ kaminari (~> 0.14.1)
+ kronic (~> 1.1.3)
launchy
- nokogiri (~> 1.4.4)
+ nokogiri (~> 1.5.5)
pg
- rails (= 3.2.6)
+ rails (= 3.2.9)
rake
rspec-rails
sass-rails (~> 3.2.5)
simple_form (~> 1.2.2)
- sqlite3-ruby
+ sqlite3
steak
- thin (~> 1.4.1)
+ thin (~> 1.5.0)
uglifier
- validates_timeliness (~> 3.0.0)
+ validates_timeliness (~> 3.0.14)
yajl-ruby
View
2  app/views/layouts/application.html.haml
@@ -39,7 +39,7 @@
= navigate_to :timeline, "Timeline", timeline_organization_path(current_organization), :class => "button pictos time"
= link_to "New Project", new_project_path, :class => "button pictos new"
= navigate_to :account, "Account", edit_user_registration_path, :class => "account"
- = link_to "Logout", destroy_user_session_path, :class => "logout"
+ = link_to "Logout", destroy_user_session_path, :class => "logout", :method => :delete
- else
- if controller.controller_name == "sessions" && controller.action_name == "new"
= link_to "Sign up", new_user_registration_path, :class => "button", :style => "float:right"
View
2  app/views/projects/show.html.haml
@@ -18,7 +18,7 @@
#activity
%ol#statuses
= render @statuses
- - if @statuses.num_pages > 1
+ - if @statuses.total_pages > 1
= link_to "Show more", page_project_statuses_path(@project, :page => 2), :remote => true, :id => "more_statuses_link", :class => "button"
#sidebar.grid_7.push_2
View
2  app/views/statuses/index.js.erb
@@ -5,6 +5,6 @@ $("#statuses").append("<%= escape_javascript(render @statuses) %>");
$.scrollTo("#status_<%= @statuses.first.id %>", 800);
<% end %>
-<% if @statuses.empty? || params[:page].to_i >= @statuses.num_pages %>
+<% if @statuses.empty? || params[:page].to_i >= @statuses.total_pages %>
$("#more_statuses_link").fadeOut();
<% end %>
View
122 config/initializers/devise.rb
@@ -1,8 +1,9 @@
-# Use this hook to configure devise mailer, warden hooks and so forth. The first
-# four configuration values can also be set straight in your models.
+# Use this hook to configure devise mailer, warden hooks and so forth.
+# Many of these configuration options can be set straight in your model.
Devise.setup do |config|
# ==> Mailer Configuration
- # Configure the e-mail address which will be shown in DeviseMailer.
+ # Configure the e-mail address which will be shown in Devise::Mailer,
+ # note that it will be overwritten if you use your own mailer class with default "from" parameter.
config.mailer_sender = "do-not-reply@#{ENV['HOST']}"
# Configure the class responsible to send e-mails.
@@ -36,10 +37,21 @@
# to authenticate or find a user. Default is :email.
config.case_insensitive_keys = [ :email ]
+ # Configure which authentication keys should have whitespace stripped.
+ # These keys will have whitespace before and after removed upon creating or
+ # modifying a user and when used to authenticate or find a user. Default is :email.
+ config.strip_whitespace_keys = [ :email ]
+
# Tell if authentication through request.params is enabled. True by default.
+ # It can be set to an array that will enable params authentication only for the
+ # given strategies, for example, `config.params_authenticatable = [:database]` will
+ # enable it only for database (email + password) authentication.
# config.params_authenticatable = true
# Tell if authentication through HTTP Basic Auth is enabled. False by default.
+ # It can be set to an array that will enable http authentication only for the
+ # given strategies, for example, `config.http_authenticatable = [:token]` will
+ # enable it only for token authentication.
# config.http_authenticatable = false
# If http headers should be returned for AJAX requests. True by default.
@@ -48,22 +60,51 @@
# The realm used in Http Basic Authentication. "Application" by default.
# config.http_authentication_realm = "Application"
+ # It will change confirmation, password recovery and other workflows
+ # to behave the same regardless if the e-mail provided was right or wrong.
+ # Does not affect registerable.
+ # config.paranoid = true
+
+ # By default Devise will store the user in session. You can skip storage for
+ # :http_auth and :token_auth by adding those symbols to the array below.
+ # Notice that if you are skipping storage for all authentication paths, you
+ # may want to disable generating routes to Devise's sessions controller by
+ # passing :skip => :sessions to `devise_for` in your config/routes.rb
+ config.skip_session_storage = [:http_auth]
+
# ==> Configuration for :database_authenticatable
# For bcrypt, this is the cost for hashing the password and defaults to 10. If
# using other encryptors, it sets how many times you want the password re-encrypted.
- config.stretches = 10
+ #
+ # Limiting the stretches to just one in testing will increase the performance of
+ # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use
+ # a value less than 10 in other environments.
+ config.stretches = Rails.env.test? ? 1 : 10
# Setup a pepper to generate the encrypted password.
config.pepper = "aaaeb02d467793cb54dd33ff3d97de2f29141429d39f786d0d0fc8447a940aab398c0e381713d6c5e1e42e3202facc9e4dbebe2e50d006093bd2c03dce88c9f8"
# ==> Configuration for :confirmable
- # The time you want to give your user to confirm his account. During this time
- # he will be able to access your application without confirming. Default is 0.days
- # When confirm_within is zero, the user won't be able to sign in without confirming.
- # You can use this to let your user access some features of your application
- # without confirming the account, but blocking it after a certain period
- # (ie 2 days).
- # config.confirm_within = 2.days
+ # A period that the user is allowed to access the website even without
+ # confirming his account. For instance, if set to 2.days, the user will be
+ # able to access the website for two days without confirming his account,
+ # access will be blocked just in the third day. Default is 0.days, meaning
+ # the user cannot access the website without confirming his account.
+ # config.allow_unconfirmed_access_for = 2.days
+
+ # A period that the user is allowed to confirm their account before their
+ # token becomes invalid. For example, if set to 3.days, the user can confirm
+ # their account within 3 days after the mail was sent, but on the fourth day
+ # their account can't be confirmed with the token any more.
+ # Default is nil, meaning there is no restriction on how long a user can take
+ # before confirming their account.
+ # config.confirm_within = 3.days
+
+ # If true, requires any email changes to be confirmed (exactly the same way as
+ # initial account confirmation) to be applied. Requires additional unconfirmed_email
+ # db field (see migrations). Until confirmed new email is stored in
+ # unconfirmed email column, and copied to email column on successful confirmation.
+ config.reconfirmable = true
# Defines which key will be used when confirming an account
# config.confirmation_keys = [ :email ]
@@ -72,32 +113,30 @@
# The time the user will be remembered without asking for credentials again.
# config.remember_for = 2.weeks
- # If true, a valid remember token can be re-used between multiple browsers.
- # config.remember_across_browsers = true
-
# If true, extends the user's remember period when remembered via cookie.
# config.extend_remember_period = false
- # If true, uses the password salt as remember token. This should be turned
- # to false if you are not using database authenticatable.
- config.use_salt_as_remember_token = true
-
# Options to be passed to the created cookie. For instance, you can set
# :secure => true in order to force SSL only cookies.
- # config.cookie_options = {}
+ # config.rememberable_options = {}
# ==> Configuration for :validatable
- # Range for password length. Default is 6..128.
- config.password_length = 6..128
+ # Range for password length. Default is 8..128.
+ config.password_length = 8..128
- # Regex to use to validate the email address
- # config.email_regexp = /\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\z/i
+ # Email regex used to validate email formats. It simply asserts that
+ # an one (and only one) @ exists in the given string. This is mainly
+ # to give user feedback and not to assert the e-mail validity.
+ # config.email_regexp = /\A[^@]+@[^@]+\z/
# ==> Configuration for :timeoutable
# The time you want to timeout the user session without activity. After this
# time the user will be asked for credentials again. Default is 30 minutes.
# config.timeout_in = 30.minutes
+ # If true, expires auth token on session timeout.
+ # config.expire_auth_token_on_timeout = false
+
# ==> Configuration for :lockable
# Defines which strategy will be used to lock an account.
# :failed_attempts = Locks an account after a number of failed attempts to sign in.
@@ -129,7 +168,7 @@
# Time interval you can reset your password with a reset password key.
# Don't put a too small interval or your users won't have the time to
# change their passwords.
- config.reset_password_within = 2.hours
+ config.reset_password_within = 6.hours
# ==> Configuration for :encryptable
# Allow you to use another encryption algorithm besides bcrypt (default). You can use
@@ -143,10 +182,6 @@
# Defines name of the authentication token params key
config.token_authentication_key = :token
- # If true, authentication through token does not store user in session and needs
- # to be supplied on each request. Useful if you are using the token as API token.
- config.stateless_token = false
-
# ==> Scopes configuration
# Turn scoped views on. Before rendering "sessions/new", it will first check for
# "users/sessions/new". It's turned off by default because it's slower if you
@@ -157,9 +192,8 @@
# devise role declared in your routes (usually :user).
# config.default_scope = :user
- # Configure sign_out behavior.
- # Sign_out action can be scoped (i.e. /users/sign_out affects only :user scope).
- # The default is true, which means any logout action will sign out all active scopes.
+ # Set this configuration to false if you want /users/sign_out to sign out
+ # only the current scope. By default, Devise signs out all scopes.
# config.sign_out_all_scopes = true
# ==> Navigation configuration
@@ -170,12 +204,11 @@
# If you have any extra navigational formats, like :iphone or :mobile, you
# should add them to the navigational formats lists.
#
- # The :"*/*" and "*/*" formats below is required to match Internet
- # Explorer requests.
- # config.navigational_formats = [:"*/*", "*/*", :html]
+ # The "*/*" below is required to match Internet Explorer requests.
+ # config.navigational_formats = ["*/*", :html]
- # The default HTTP method used to sign out a resource. Default is :get.
- # config.sign_out_via = :get
+ # The default HTTP method used to sign out a resource. Default is :delete.
+ config.sign_out_via = :delete
# ==> OmniAuth
# Add a new OmniAuth provider. Check the wiki for more information on setting
@@ -187,8 +220,21 @@
# change the failure app, you can configure them inside the config.warden block.
#
# config.warden do |manager|
- # manager.failure_app = AnotherApp
# manager.intercept_401 = false
# manager.default_strategies(:scope => :user).unshift :some_external_strategy
# end
-end
+
+ # ==> Mountable engine configurations
+ # When using Devise inside an engine, let's call it `MyEngine`, and this engine
+ # is mountable, there are some extra configurations to be taken into account.
+ # The following options are available, assuming the engine is mounted as:
+ #
+ # mount MyEngine, at: "/my_engine"
+ #
+ # The router that invoked `devise_for`, in the example above, would be:
+ # config.router_name = :my_engine
+ #
+ # When using omniauth, Devise cannot automatically set Omniauth path,
+ # so you need to do it manually. For the users scope, it would be:
+ # config.omniauth_path_prefix = "/my_engine/users/auth"
+end
View
4 config/locales/devise.en.yml
@@ -32,7 +32,9 @@ en:
confirmed: 'Your account was successfully confirmed. You are now signed in.'
registrations:
signed_up: 'Your account was successfully created. Welcome to Splendid Bacon.'
- inactive_signed_up: 'You have signed up successfully. However, we could not sign you in because your account is %{reason}.'
+ signed_up_but_unconfirmed: 'A message with a confirmation link has been sent to your email address. Please open the link to activate your account.'
+ signed_up_but_inactive: 'You have signed up successfully. However, we could not sign you in because your account is not yet activated.'
+ signed_up_but_locked: 'You have signed up successfully. However, we could not sign you in because your account is locked.'
updated: 'You updated your account successfully.'
destroyed: 'Bye! Your account was successfully cancelled. We hope to see you again soon.'
unlocks:
View
4 spec/acceptance/account_creation_spec.rb
@@ -3,7 +3,7 @@
feature "Account Creation" do
scenario "Sign up" do
visit sign_up_page
- fill_in_sign_up_form(:email => "joe@doe.com", :name => "John Doe", :password => "123456")
+ fill_in_sign_up_form(:email => "joe@doe.com", :name => "John Doe", :password => "12345678")
click_button "Sign up"
page.should have_content("Your account was successfully created. Welcome to Splendid Bacon")
@@ -23,7 +23,7 @@
visit "/"
click_link "Try the Demo"
click_link "Sign up here."
- fill_in_sign_up_form(:email => "joe@doe.com", :name => "John Doe", :password => "123456")
+ fill_in_sign_up_form(:email => "joe@doe.com", :name => "John Doe", :password => "12345678")
click_button "Sign up"
page.should have_content("Your account was successfully created. Welcome to Splendid Bacon")
View
12 spec/acceptance/invites_spec.rb
@@ -2,14 +2,14 @@
feature "Invites" do
background do
- @al = User.create(:email => "al@kiskolabs.com", :name => "Al", :password => "123456")
- @bob = User.create(:email => "bob@kiskolabs.com", :name => "Bob", :password => "123456")
-
+ @al = User.create(:email => "al@kiskolabs.com", :name => "Al", :password => "12345678")
+ @bob = User.create(:email => "bob@kiskolabs.com", :name => "Bob", :password => "12345678")
+
@kisko = @al.organizations.create(:name => "Kisko Labs")
end
scenario "Creating a new invite", :js => true do
- login_as(@al, :password => "123456")
+ login_as(@al, :password => "12345678")
visit organization_page(@kisko.id)
find(:css, "#organization_nav h1 a").click
fill_in "invitation_email", :with => "foo@foo.com"
@@ -20,7 +20,7 @@
scenario "Accepting an invite as a user" do
invite = Invitation.create(:email => @bob.email, :organization => @kisko)
- login_as(@bob, :password => "123456")
+ login_as(@bob, :password => "12345678")
visit accept_invitation_page(invite.token)
click_button "Accept invitation"
page.should have_content("You are now a part of #{invite.organization.name}")
@@ -37,7 +37,7 @@
@kisko.save
member = @kisko.memberships.where(:user_id => @bob.id).first
- login_as(@al, :password => "123456")
+ login_as(@al, :password => "12345678")
visit organization_edit_page(@kisko.id)
find(:xpath, "//li[@id='member_#{member.id}']/span/a").click
View
2  spec/acceptance/organizations_spec.rb
@@ -2,7 +2,7 @@
feature "Organizations" do
background do
- @al = User.create(:email => "al@kiskolabs.com", :name => "Al", :password => "123456")
+ @al = User.create(:email => "al@kiskolabs.com", :name => "Al", :password => "12345678")
@kisko = @al.organizations.create(:name => "Kisko Labs")
end
View
2  spec/acceptance/projects_spec.rb
@@ -2,7 +2,7 @@
feature "Projects" do
background do
- @al = User.create(:email => "al@kiskolabs.com", :name => "Al", :password => "123456")
+ @al = User.create(:email => "al@kiskolabs.com", :name => "Al", :password => "12345678")
@al.reset_authentication_token
@al.save
View
2  spec/acceptance/timeline_spec.rb
@@ -2,7 +2,7 @@
feature "Timeline" do
background do
- @al = User.create(:email => "al@kiskolabs.com", :name => "Al", :password => "123456")
+ @al = User.create(:email => "al@kiskolabs.com", :name => "Al", :password => "12345678")
@al.reset_authentication_token
@al.save
View
2  spec/acceptance/users_spec.rb
@@ -2,7 +2,7 @@
feature "Users" do
background do
- @al = User.create(:email => "al@kiskolabs.com", :name => "Al", :password => "123456")
+ @al = User.create(:email => "al@kiskolabs.com", :name => "Al", :password => "12345678")
login_as(@al)
end
View
2  spec/factories/user.rb
@@ -4,6 +4,6 @@
factory :user do
name "John Doe"
email { generate(:email) }
- password "123456"
+ password "12345678"
end
end
View
2  spec/models/status_spec.rb
@@ -3,7 +3,7 @@
describe Status do
context "GitHub" do
before(:each) do
- @user = User.create(:name => "Chris Wanstrath", :email => "chris@ozmm.org", :password => "123456")
+ @user = User.create(:name => "Chris Wanstrath", :email => "chris@ozmm.org", :password => "12345678")
@organization = @user.organizations.create(:name => "Test")
@project = @organization.projects.create({ :name => "GitHub",
:start => Date.today - 7.days,
Something went wrong with that request. Please try again.