Commit 44a2dc43 authored by Alexandre Friquet's avatar Alexandre Friquet
Browse files

Updates Rspec to 3.5: refs #17.

parent 79642bfb
......@@ -65,7 +65,7 @@ end
group :development, :test do
gem "sqlite3"
gem 'rspec-rails'
gem 'rspec-rails', '~> 3.5.0'
gem 'pry-rails'
end
......@@ -78,6 +78,7 @@ group :test do
gem 'launchy'
gem 'factory_girl_rails'
gem 'shoulda-matchers'
gem 'test-unit', '~> 3.0' # For shoulda-matchers with ruby 2.3+
gem 'database_cleaner'
gem 'capybara-webkit'
gem 'fuubar'
......@@ -85,7 +86,7 @@ group :test do
end
group :development do
gem 'mailcatcher'
#gem 'mailcatcher'
gem 'brakeman'
gem 'puma'
end
......@@ -59,7 +59,7 @@ GEM
slim (>= 1.3.6, < 4.0)
terminal-table (~> 1.4)
builder (3.0.4)
capybara (2.1.0)
capybara (2.4.4)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
......@@ -93,14 +93,13 @@ GEM
delayed_job_active_record (0.4.4)
activerecord (>= 2.1.0, < 4)
delayed_job (~> 3.0)
diff-lcs (1.2.4)
diff-lcs (1.3)
docile (1.1.5)
dotenv (2.0.1)
dotenv-rails (2.0.1)
dotenv (= 2.0.1)
erubis (2.7.0)
event-calendar (2.3.3)
eventmachine (1.0.3)
execjs (1.4.0)
multi_json (~> 1.0)
extlib (0.9.16)
......@@ -123,10 +122,9 @@ GEM
actionpack (~> 3.0)
bluecloth (~> 2.2)
fssm (0.2.10)
fuubar (1.2.1)
rspec (~> 2.0)
rspec-instafail (~> 0.2.0)
ruby-progressbar (~> 1.0)
fuubar (2.2.0)
rspec-core (~> 3.0)
ruby-progressbar (~> 1.4)
geocoder (1.2.0)
gmaps4rails (2.1.2)
google-api-client (0.7.1)
......@@ -150,7 +148,7 @@ GEM
highline (1.6.8)
hike (1.2.3)
hirb (0.7.1)
i18n (0.7.0)
i18n (0.8.4)
journey (1.0.4)
jquery-colorpicker-rails (1.0.3.1)
jquery-ui-rails (~> 4.0)
......@@ -160,28 +158,21 @@ GEM
jquery-ui-rails (4.0.3)
jquery-rails
railties (>= 3.1.0)
json (1.8.3)
json (1.8.6)
jwt (1.2.0)
launchy (2.3.0)
addressable (~> 2.3)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mailcatcher (0.5.11)
activesupport (~> 3.0)
eventmachine (~> 1.0.0)
haml (>= 3.1, < 5)
mail (~> 2.3)
sinatra (~> 1.2)
skinny (~> 0.2.3)
sqlite3 (~> 1.3)
thin (~> 1.5.0)
method_source (0.8.1)
mime-types (1.25.1)
mini_portile2 (2.2.0)
multi_json (1.12.1)
multipart-post (2.0.0)
nested_form (0.3.2)
nokogiri (1.5.9)
nokogiri (1.8.0)
mini_portile2 (~> 2.2.0)
paperclip (2.4.5)
activerecord (>= 2.3.0)
activesupport (>= 2.3.2)
......@@ -189,6 +180,7 @@ GEM
mime-types
pdfkit (0.6.2)
polyglot (0.3.5)
power_assert (1.0.2)
prettyphoto-rails (0.2.1)
jquery-rails
rails (>= 3.1)
......@@ -202,10 +194,8 @@ GEM
pry (>= 0.9.10)
puma (3.1.0)
rack (1.4.7)
rack-cache (1.6.1)
rack-cache (1.7.0)
rack (>= 0.4)
rack-protection (1.5.0)
rack
rack-ssl (1.3.4)
rack
rack-test (0.6.3)
......@@ -225,28 +215,28 @@ GEM
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
rake (11.3.0)
rake (12.0.0)
rdoc (3.12.2)
json (~> 1.4)
retriable (1.4.1)
rspec (2.13.0)
rspec-core (~> 2.13.0)
rspec-expectations (~> 2.13.0)
rspec-mocks (~> 2.13.0)
rspec-core (2.13.1)
rspec-expectations (2.13.0)
diff-lcs (>= 1.1.3, < 2.0)
rspec-instafail (0.2.6)
rspec
rspec-mocks (2.13.1)
rspec-rails (2.13.2)
rspec-core (3.5.4)
rspec-support (~> 3.5.0)
rspec-expectations (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0)
rspec-mocks (3.5.0)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.5.0)
rspec-rails (3.5.2)
actionpack (>= 3.0)
activesupport (>= 3.0)
railties (>= 3.0)
rspec-core (~> 2.13.0)
rspec-expectations (~> 2.13.0)
rspec-mocks (~> 2.13.0)
ruby-progressbar (1.7.1)
rspec-core (~> 3.5.0)
rspec-expectations (~> 3.5.0)
rspec-mocks (~> 3.5.0)
rspec-support (~> 3.5.0)
rspec-support (3.5.0)
ruby-progressbar (1.8.1)
ruby2ruby (2.2.0)
ruby_parser (~> 3.1)
sexp_processor (~> 4.0)
......@@ -259,7 +249,7 @@ GEM
sass (>= 3.1.10)
tilt (~> 1.3)
sexp_processor (4.6.0)
shoulda-matchers (2.1.0)
shoulda-matchers (2.8.0)
activesupport (>= 3.0.0)
signet (0.6.0)
addressable (~> 2.3)
......@@ -275,13 +265,6 @@ GEM
json (~> 1.8)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.0)
sinatra (1.3.6)
rack (~> 1.4)
rack-protection (~> 1.3)
tilt (~> 1.3, >= 1.3.3)
skinny (0.2.3)
eventmachine (~> 1.0.0)
thin (~> 1.5.0)
slim (3.0.6)
temple (~> 0.7.3)
tilt (>= 1.3.3, < 2.1)
......@@ -291,17 +274,15 @@ GEM
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.7)
sqlite3 (1.3.13)
susy (1.0.9)
compass (>= 0.12.2)
sass (>= 3.2.0)
temple (0.7.6)
terminal-table (1.5.2)
thin (1.5.1)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.19.1)
test-unit (3.2.5)
power_assert
thor (0.19.4)
tilt (1.4.1)
timecop (0.8.0)
treetop (1.4.15)
......@@ -321,7 +302,7 @@ GEM
addressable (>= 2.2.7)
crack (>= 0.3.2)
will_paginate (3.0.4)
xpath (2.0.0)
xpath (2.1.0)
nokogiri (~> 1.3)
zeroclipboard-rails (0.0.7)
railties (>= 3.1)
......@@ -358,7 +339,6 @@ DEPENDENCIES
jquery-rails
jquery-ui-rails
launchy
mailcatcher
nested_form
paperclip
pdfkit
......@@ -368,13 +348,14 @@ DEPENDENCIES
puma
rails (= 3.2.22.5)
rdoc
rspec-rails
rspec-rails (~> 3.5.0)
sass-rails (~> 3.2.3)
shoulda-matchers
simple_form
simplecov (>= 0.4.0)
sqlite3
susy
test-unit (~> 3.0)
timecop (~> 0.8.0)
truncate_html
turbo-sprockets-rails3
......@@ -385,4 +366,4 @@ DEPENDENCIES
zeroclipboard-rails
BUNDLED WITH
1.13.2
1.14.5
......@@ -20,7 +20,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with OLIGAA. If not, see <http://www.gnu.org/licenses/>.
#
require "spec_helper"
require 'rails_helper'
feature "Manage Activities" do
context "as an admin" do
......
......@@ -20,7 +20,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with OLIGAA. If not, see <http://www.gnu.org/licenses/>.
#
require "spec_helper"
require 'rails_helper'
feature "Manage Activity Categories" do
context "as an admin" do
......
......@@ -20,7 +20,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with OLIGAA. If not, see <http://www.gnu.org/licenses/>.
#
require "spec_helper"
require 'rails_helper'
feature "Authentication" do
......
......@@ -20,7 +20,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with OLIGAA. If not, see <http://www.gnu.org/licenses/>.
#
require "spec_helper"
require 'rails_helper'
feature "Use calendar" do
context "as a guest" do
......
......@@ -20,7 +20,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with OLIGAA. If not, see <http://www.gnu.org/licenses/>.
#
require "spec_helper"
require 'rails_helper'
feature "Manage contact types" do
context "as an admin" do
......
......@@ -20,7 +20,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with OLIGAA. If not, see <http://www.gnu.org/licenses/>.
#
require "spec_helper"
require 'rails_helper'
feature "ContactUS mails" do
context "as a guest" do
......
......@@ -20,7 +20,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with OLIGAA. If not, see <http://www.gnu.org/licenses/>.
#
require "spec_helper"
require 'rails_helper'
feature "Manage Emails" do
context "as an admin" do
......
......@@ -20,7 +20,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with OLIGAA. If not, see <http://www.gnu.org/licenses/>.
#
require "spec_helper"
require 'rails_helper'
feature "Manage Event Types" do
context "as an admin" do
......
......@@ -20,7 +20,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with OLIGAA. If not, see <http://www.gnu.org/licenses/>.
#
require "spec_helper"
require 'rails_helper'
feature "Manage events" do
context "as an admin" do
......
......@@ -20,7 +20,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with OLIGAA. If not, see <http://www.gnu.org/licenses/>.
#
require "spec_helper"
require 'rails_helper'
feature "Manage Member Groups" do
context "as an admin" do
......
......@@ -20,7 +20,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with OLIGAA. If not, see <http://www.gnu.org/licenses/>.
#
require "spec_helper"
require 'rails_helper'
feature "Manage members" do
context "as an admin" do
......
......@@ -20,7 +20,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with OLIGAA. If not, see <http://www.gnu.org/licenses/>.
#
require "spec_helper"
require 'rails_helper'
feature "Manage menus" do
......
......@@ -20,7 +20,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with OLIGAA. If not, see <http://www.gnu.org/licenses/>.
#
require "spec_helper"
require 'rails_helper'
feature "Manage newsletters" do
context "as an admin" do
......
......@@ -20,7 +20,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with OLIGAA. If not, see <http://www.gnu.org/licenses/>.
#
require "spec_helper"
require 'rails_helper'
feature "Manage Novel Types" do
context "as an admin" do
......
......@@ -20,7 +20,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with OLIGAA. If not, see <http://www.gnu.org/licenses/>.
#
require "spec_helper"
require 'rails_helper'
feature "Manage Novels" do
context "as an admin" do
......
......@@ -20,7 +20,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with OLIGAA. If not, see <http://www.gnu.org/licenses/>.
#
require "spec_helper"
require 'rails_helper'
feature "Manage Pages" do
context "as an admin" do
......
......@@ -20,7 +20,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with OLIGAA. If not, see <http://www.gnu.org/licenses/>.
#
require "spec_helper"
require 'rails_helper'
feature "Manage Partners Groups" do
context "as an admin" do
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment