RSpec config.expose_dsl_globally = false support

Also resolves #148
glebm · Jul 30, 2015 · 2bee3dc · 2bee3dc
1 parent 20bab5b
commit 2bee3dc
Show file tree

Hide file tree

Showing 19 changed files with 19 additions and 18 deletions.
diff --git a/i18n-tasks.gemspec b/i18n-tasks.gemspec
@@ -43,6 +43,6 @@ TEXT
   s.add_development_dependency 'axlsx', '~> 2.0'
   s.add_development_dependency 'bundler', '~> 1.3'
   s.add_development_dependency 'rake'
-  s.add_development_dependency 'rspec', '~> 3.0'
+  s.add_development_dependency 'rspec', '~> 3.3'
   s.add_development_dependency 'yard'
 end
diff --git a/spec/commands/data_commands_spec.rb b/spec/commands/data_commands_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Data commands' do
+RSpec.describe 'Data commands' do
   delegate :run_cmd, to: :TestCodebase
   def en_data
     {'en' => {'a' => '1', 'common' => {'hello' => 'Hello'}}}

diff --git a/spec/commands/tree_commands_spec.rb b/spec/commands/tree_commands_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Tree commands' do
+RSpec.describe 'Tree commands' do
   delegate :run_cmd, to: :TestCodebase
   before do
     TestCodebase.setup

diff --git a/spec/conservative_router_spec.rb b/spec/conservative_router_spec.rb
@@ -1,7 +1,7 @@
 # coding: utf-8
 require 'spec_helper'
 
-describe 'Conservative router' do
+RSpec.describe 'Conservative router' do
   describe '#available_locales' do
     before do
       TestCodebase.setup(

diff --git a/spec/file_system_data_spec.rb b/spec/file_system_data_spec.rb
@@ -1,7 +1,7 @@
 # coding: utf-8
 require 'spec_helper'
 
-describe 'File system i18n' do
+RSpec.describe 'File system i18n' do
   describe '#available_locales' do
     before do
       TestCodebase.setup(

diff --git a/spec/google_translate_spec.rb b/spec/google_translate_spec.rb
@@ -2,7 +2,7 @@
 require 'spec_helper'
 require 'i18n/tasks/commands'
 
-describe 'Google Translation' do
+RSpec.describe 'Google Translation' do
   include I18n::Tasks::GoogleTranslation
 
   tests = [

diff --git a/spec/i18n_spec.rb b/spec/i18n_spec.rb
@@ -1,6 +1,6 @@
 require 'i18n/tasks'
 
-describe 'I18n' do
+RSpec.describe 'I18n' do
   let(:i18n) { I18n::Tasks::BaseTask.new }
   let(:missing_keys) { i18n.missing_keys }
   let(:unused_keys) { i18n.unused_keys }

diff --git a/spec/i18n_tasks_spec.rb b/spec/i18n_tasks_spec.rb
@@ -4,7 +4,7 @@
 require 'open3'
 
 # Integration tests
-describe 'i18n-tasks' do
+RSpec.describe 'i18n-tasks' do
   delegate :run_cmd, :run_cmd_capture_stderr, :i18n_task, :in_test_app_dir, to: :TestCodebase
 
   describe 'bin/i18n-tasks' do

diff --git a/spec/key_pattern_matching_spec.rb b/spec/key_pattern_matching_spec.rb
@@ -1,7 +1,7 @@
 # coding: utf-8
 require 'spec_helper'
 
-describe 'Key pattern' do
+RSpec.describe 'Key pattern' do
   include I18n::Tasks::KeyPatternMatching
   describe 'matching' do
     describe '*' do

diff --git a/spec/locale_pathname_spec.rb b/spec/locale_pathname_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'LocalePathname' do
+RSpec.describe 'LocalePathname' do
   include ::I18n::Tasks::LocalePathname
   context '#replace_locale' do
 

diff --git a/spec/locale_tree/siblings_spec.rb b/spec/locale_tree/siblings_spec.rb
@@ -1,7 +1,7 @@
 # coding: utf-8
 require 'spec_helper'
 
-describe 'Tree siblings / forest' do
+RSpec.describe 'Tree siblings / forest' do
 
   context 'Node' do
     it '::new with children' do

diff --git a/spec/pattern_scanner_spec.rb b/spec/pattern_scanner_spec.rb
@@ -1,7 +1,7 @@
 # coding: utf-8
 require 'spec_helper'
 
-describe 'Pattern Scanner' do
+RSpec.describe 'Pattern Scanner' do
   describe 'scan_file' do
     it 'returns absolute keys from controllers' do
       file_path = 'spec/fixtures/app/controllers/events_controller.rb'

diff --git a/spec/plural_keys_spec.rb b/spec/plural_keys_spec.rb
@@ -1,7 +1,7 @@
 # coding: utf-8
 require 'spec_helper'
 
-describe 'Plural keys' do
+RSpec.describe 'Plural keys' do
   let(:task) { ::I18n::Tasks::BaseTask.new }
   before do
     TestCodebase.setup('config/locales/en.yml' => '')

diff --git a/spec/readme_spec.rb b/spec/readme_spec.rb
@@ -1,6 +1,6 @@
 # coding: utf-8
 
-describe 'README.md' do
+RSpec.describe 'README.md' do
   let(:readme) { File.read('README.md', encoding: 'UTF-8') }
   it 'has valid YAML in ```yaml blocks' do
     readme.scan /```yaml\n(.*)(?=^)\n```/ do |m|

diff --git a/spec/relative_keys_spec.rb b/spec/relative_keys_spec.rb
@@ -1,6 +1,6 @@
 # coding: utf-8
 require 'spec_helper'
-describe 'Relative keys' do
+RSpec.describe 'Relative keys' do
   let(:scanner) { I18n::Tasks::Scanners::BaseScanner.new }
 
   describe 'absolutize_key' do

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -17,6 +17,7 @@
 Dir['spec/support/**/*.rb'].each { |f| require "./#{f}" }
 
 RSpec.configure do |config|
+  config.expose_dsl_globally = false
   config.include FixturesSupport
   config.include CaptureStd
   config.include Trees

diff --git a/spec/split_key_spec.rb b/spec/split_key_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'SplitKey' do
+RSpec.describe 'SplitKey' do
   include ::I18n::Tasks::SplitKey
 
   [['', %w()],

diff --git a/spec/used_keys_spec.rb b/spec/used_keys_spec.rb
@@ -1,7 +1,7 @@
 # coding: utf-8
 require 'spec_helper'
 
-describe 'UsedKeys' do
+RSpec.describe 'UsedKeys' do
   let!(:task) { I18n::Tasks::BaseTask.new }
   let(:file_name) { 'a.html.slim' }
   let(:file_content) do

diff --git a/templates/rspec/i18n_spec.rb b/templates/rspec/i18n_spec.rb
@@ -1,6 +1,6 @@
 require 'i18n/tasks'
 
-describe 'I18n' do
+RSpec.describe 'I18n' do
   let(:i18n) { I18n::Tasks::BaseTask.new }
   let(:missing_keys) { i18n.missing_keys }
   let(:unused_keys) { i18n.unused_keys }