Download as
Browse Code »

Commit 236fe11928a0eb0233ed07a7e29a17535b8c83eb

Authored by Rafael Manzo
1 parent 865b8ea6
Exists in colab and in 4 other branches master, spb-master, spb-stable, stable

shoulda-matchers updated to 2.6.1.rc1

Showing 6 changed files with 11 additions and 16 deletions   Show diff stats
@@ -62,7 +62,7 @@ gem 'spring', group: :development @@ -62,7 +62,7 @@ gem 'spring', group: :development
62 62
63 group :test do 63 group :test do
64 # Easier test writing 64 # Easier test writing
65 - gem "shoulda-matchers", require: false # not requiring is necessary to avoid warnings from minitest 5, with version 2.6 this might get fixed 65 + gem "shoulda-matchers", '~> 2.6.1.rc1'
66 66
67 # Test coverage 67 # Test coverage
68 gem 'simplecov', require: false 68 gem 'simplecov', require: false
@@ -200,7 +200,7 @@ GEM @@ -200,7 +200,7 @@ GEM
200 sdoc (0.4.0) 200 sdoc (0.4.0)
201 json (~> 1.8) 201 json (~> 1.8)
202 rdoc (~> 4.0, < 5.0) 202 rdoc (~> 4.0, < 5.0)
203 - shoulda-matchers (2.6.0) 203 + shoulda-matchers (2.6.1.rc1)
204 activesupport (>= 3.0.0) 204 activesupport (>= 3.0.0)
205 simplecov (0.8.2) 205 simplecov (0.8.2)
206 docile (~> 1.1.0) 206 docile (~> 1.1.0)
@@ -283,7 +283,7 @@ DEPENDENCIES @@ -283,7 +283,7 @@ DEPENDENCIES
283 rspec-rails 283 rspec-rails
284 sass-rails (~> 4.0.1) 284 sass-rails (~> 4.0.1)
285 sdoc 285 sdoc
286 - shoulda-matchers 286 + shoulda-matchers (~> 2.6.1.rc1)
287 simplecov 287 simplecov
288 spring 288 spring
289 sqlite3 289 sqlite3
spec/controllers/mezuro_ranges_controller_spec.rb
  Diff comments   View file @236fe11
@@ -3,7 +3,7 @@ require &#39;spec_helper&#39; @@ -3,7 +3,7 @@ require &#39;spec_helper&#39;
3 describe MezuroRangesController do 3 describe MezuroRangesController do
4 let(:mezuro_range) { FactoryGirl.build(:mezuro_range, id: 1) } 4 let(:mezuro_range) { FactoryGirl.build(:mezuro_range, id: 1) }
5 let(:metric_configuration) { FactoryGirl.build(:metric_configuration) } 5 let(:metric_configuration) { FactoryGirl.build(:metric_configuration) }
6 - 6 +
7 describe 'new' do 7 describe 'new' do
8 let(:mezuro_configuration) { FactoryGirl.build(:mezuro_configuration) } 8 let(:mezuro_configuration) { FactoryGirl.build(:mezuro_configuration) }
9 9
@@ -107,12 +107,12 @@ describe MezuroRangesController do @@ -107,12 +107,12 @@ describe MezuroRangesController do
107 it { should redirect_to new_user_session_path } 107 it { should redirect_to new_user_session_path }
108 end 108 end
109 end 109 end
110 - 110 +
111 describe 'edit' do 111 describe 'edit' do
112 let(:metric_configuration) { FactoryGirl.build(:metric_configuration) } 112 let(:metric_configuration) { FactoryGirl.build(:metric_configuration) }
113 let(:mezuro_range) { FactoryGirl.build(:mezuro_range, id: 1, metric_configuration_id: metric_configuration.id) } 113 let(:mezuro_range) { FactoryGirl.build(:mezuro_range, id: 1, metric_configuration_id: metric_configuration.id) }
114 let(:reading) { FactoryGirl.build(:reading, group_id: metric_configuration.reading_group_id) } 114 let(:reading) { FactoryGirl.build(:reading, group_id: metric_configuration.reading_group_id) }
115 - 115 +
116 context 'with an User logged in' do 116 context 'with an User logged in' do
117 before do 117 before do
118 sign_in FactoryGirl.create(:user) 118 sign_in FactoryGirl.create(:user)
@@ -132,7 +132,7 @@ describe MezuroRangesController do @@ -132,7 +132,7 @@ describe MezuroRangesController do
132 132
133 context 'when the user does not own the mezuro range' do 133 context 'when the user does not own the mezuro range' do
134 let!(:reading_group) { FactoryGirl.build(:reading_group, id: metric_configuration.reading_group_id) } 134 let!(:reading_group) { FactoryGirl.build(:reading_group, id: metric_configuration.reading_group_id) }
135 - 135 +
136 before do 136 before do
137 get :edit, id: mezuro_range.id, mezuro_configuration_id: metric_configuration.configuration_id, metric_configuration_id: metric_configuration.id 137 get :edit, id: mezuro_range.id, mezuro_configuration_id: metric_configuration.configuration_id, metric_configuration_id: metric_configuration.id
138 end 138 end
@@ -151,7 +151,7 @@ describe MezuroRangesController do @@ -151,7 +151,7 @@ describe MezuroRangesController do
151 it { should redirect_to new_user_session_path } 151 it { should redirect_to new_user_session_path }
152 end 152 end
153 end 153 end
154 - 154 +
155 describe 'update' do 155 describe 'update' do
156 let(:metric_configuration) { FactoryGirl.build(:metric_configuration) } 156 let(:metric_configuration) { FactoryGirl.build(:metric_configuration) }
157 let(:mezuro_range) { FactoryGirl.build(:mezuro_range, id: 1, metric_configuration_id: metric_configuration.id) } 157 let(:mezuro_range) { FactoryGirl.build(:mezuro_range, id: 1, metric_configuration_id: metric_configuration.id) }
spec/controllers/repositories_controller_spec.rb
  Diff comments   View file @236fe11
@@ -173,11 +173,7 @@ describe RepositoriesController do @@ -173,11 +173,7 @@ describe RepositoriesController do
173 173
174 it { should redirect_to(projects_url) } 174 it { should redirect_to(projects_url) }
175 it { should respond_with(:redirect) } 175 it { should respond_with(:redirect) }
176 - it 'should set the flash' do  
177 - pending 'incompability between shoulda-matchers and Rails 4.1.0.rc1' do  
178 - should set_the_flash[:notice].to("You're not allowed to do this operation")  
179 - end  
180 - end 176 + it { should set_the_flash[:notice].to("You're not allowed to do this operation") }
181 end 177 end
182 end 178 end
183 179
spec/routing/readings_routing_spec.rb
  Diff comments   View file @236fe11
@@ -15,6 +15,6 @@ describe ReadingsController do @@ -15,6 +15,6 @@ describe ReadingsController do
15 it { should route(:put, '/reading_groups/1/readings/1'). 15 it { should route(:put, '/reading_groups/1/readings/1').
16 to(controller: :readings, action: :update, reading_group_id: 1, id: 1) } 16 to(controller: :readings, action: :update, reading_group_id: 1, id: 1) }
17 it { should_not route(:get, '/reading_groups/1/readings'). 17 it { should_not route(:get, '/reading_groups/1/readings').
18 - to(controller: :readings, action: :index, reading_group_id: 1) }  
19 - end 18 + to(controller: :readings, action: :index, reading_group_id: 1) }
  19 + end
20 end 20 end
spec/spec_helper.rb
  Diff comments   View file @236fe11
@@ -24,7 +24,6 @@ ENV[&quot;RAILS_ENV&quot;] ||= &#39;test&#39; @@ -24,7 +24,6 @@ ENV[&quot;RAILS_ENV&quot;] ||= &#39;test&#39;
24 require File.expand_path("../../config/environment", __FILE__) 24 require File.expand_path("../../config/environment", __FILE__)
25 require 'rspec/rails' 25 require 'rspec/rails'
26 require 'rspec/autorun' 26 require 'rspec/autorun'
27 -require 'shoulda-matchers' # requiring here is necessary to avoid warnings from minitest 5, with version 2.6 this might get fixed  
28 27
29 # Requires supporting ruby files with custom matchers and macros, etc, 28 # Requires supporting ruby files with custom matchers and macros, etc,
30 # in spec/support/ and its subdirectories. 29 # in spec/support/ and its subdirectories.