diff options
| author | Robert | 2017-07-06 14:15:25 +0200 |
|---|---|---|
| committer | Robert | 2017-07-06 14:15:25 +0200 |
| commit | b055e1266427c8edb8469e7153c64f1d1bf9c54f (patch) | |
| tree | 8a4f38be383ab424bfed8fca4c016d3a81455fef /spec/helpers | |
| parent | 1b5b681603f629b901deabffc4c55f654bbcfe14 (diff) | |
| parent | 6f63feeb32883b57d05bed7f3817e01caba12289 (diff) | |
| download | chouette-core-b055e1266427c8edb8469e7153c64f1d1bf9c54f.tar.bz2 | |
Conflict resolved
Diffstat (limited to 'spec/helpers')
| -rw-r--r-- | spec/helpers/table_builder_helper_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/helpers/table_builder_helper_spec.rb b/spec/helpers/table_builder_helper_spec.rb index c2c287b99..4f7c1bd69 100644 --- a/spec/helpers/table_builder_helper_spec.rb +++ b/spec/helpers/table_builder_helper_spec.rb @@ -177,7 +177,7 @@ describe TableBuilderHelper, type: :helper do referential: referential ) allow(helper).to receive(:current_user).and_return(user_context) - allow(TableBuilderHelper::URL).to receive(:current_referential) + allow(helper).to receive(:current_referential) .and_return(referential) companies = [company] @@ -286,7 +286,7 @@ describe TableBuilderHelper, type: :helper do referential: referential ) allow(helper).to receive(:current_user).and_return(user_context) - allow(TableBuilderHelper::URL).to receive(:current_referential) + allow(helper).to receive(:current_referential) .and_return(referential) companies = [company] |