From 1f12b39731a99a3a92ec569141f7d2cd12085a89 Mon Sep 17 00:00:00 2001 From: Sebastian Serth Date: Tue, 11 Sep 2018 10:53:58 +0200 Subject: [PATCH] Hide FactoryBot deprecation warning by changing static assignment Signed-off-by: Sebastian Serth --- spec/factories/code_ocean/file.rb | 8 +- spec/factories/consumer.rb | 2 +- spec/factories/error.rb | 2 +- spec/factories/execution_environment.rb | 140 +++++++++++------------ spec/factories/exercise.rb | 56 ++++----- spec/factories/file_type.rb | 130 ++++++++++----------- spec/factories/hint.rb | 74 ++++++------ spec/factories/internal_user.rb | 10 +- spec/factories/lti_parameter.rb | 4 +- spec/factories/proxy_exercise.rb | 4 +- spec/factories/submission.rb | 2 +- spec/factories/user_exercise_feedback.rb | 2 +- 12 files changed, 217 insertions(+), 217 deletions(-) diff --git a/spec/factories/code_ocean/file.rb b/spec/factories/code_ocean/file.rb index bc672045..186ad1d1 100644 --- a/spec/factories/code_ocean/file.rb +++ b/spec/factories/code_ocean/file.rb @@ -3,13 +3,13 @@ require 'seeds_helper' module CodeOcean FactoryBot.define do factory :file, class: CodeOcean::File do - content '' + content { '' } association :context, factory: :submission association :file_type, factory: :dot_rb - hidden false + hidden { false } name { SecureRandom.hex } - read_only false - role 'main_file' + read_only { false } + role { 'main_file' } end end end diff --git a/spec/factories/consumer.rb b/spec/factories/consumer.rb index a4f32ca8..59b05b8d 100644 --- a/spec/factories/consumer.rb +++ b/spec/factories/consumer.rb @@ -1,6 +1,6 @@ FactoryBot.define do factory :consumer do - name 'openHPI' + name { 'openHPI' } oauth_key { SecureRandom.hex } oauth_secret { SecureRandom.hex } singleton_consumer diff --git a/spec/factories/error.rb b/spec/factories/error.rb index c10d47bf..427fee7d 100644 --- a/spec/factories/error.rb +++ b/spec/factories/error.rb @@ -1,6 +1,6 @@ FactoryBot.define do factory :error, class: Error do association :execution_environment, factory: :ruby - message "exercise.rb:4:in `
': undefined local variable or method `foo' for main:Object (NameError)" + message { "exercise.rb:4:in `
': undefined local variable or method `foo' for main:Object (NameError)" } end end diff --git a/spec/factories/execution_environment.rb b/spec/factories/execution_environment.rb index 013a041b..7eaaa49b 100644 --- a/spec/factories/execution_environment.rb +++ b/spec/factories/execution_environment.rb @@ -2,146 +2,146 @@ FactoryBot.define do factory :coffee_script, class: ExecutionEnvironment do created_by_teacher default_memory_limit - docker_image 'hklement/ubuntu-coffee:latest' + docker_image { 'hklement/ubuntu-coffee:latest' } association :file_type, factory: :dot_coffee help - name 'CoffeeScript' - network_enabled false - permitted_execution_time 10.seconds - pool_size 0 - run_command 'coffee' + name { 'CoffeeScript' } + network_enabled { false } + permitted_execution_time { 10.seconds } + pool_size { 0 } + run_command { 'coffee' } singleton_execution_environment end factory :html, class: ExecutionEnvironment do created_by_teacher default_memory_limit - docker_image 'hklement/ubuntu-html:latest' + docker_image { 'hklement/ubuntu-html:latest' } association :file_type, factory: :dot_html help - name 'HTML5' - network_enabled false - permitted_execution_time 10.seconds - pool_size 0 - run_command 'touch' + name { 'HTML5' } + network_enabled { false } + permitted_execution_time { 10.seconds } + pool_size { 0 } + run_command { 'touch' } singleton_execution_environment - test_command 'rspec %{filename} --format documentation' - testing_framework 'RspecAdapter' + test_command { 'rspec %{filename} --format documentation' } + testing_framework { 'RspecAdapter' } end factory :java, class: ExecutionEnvironment do created_by_teacher default_memory_limit - docker_image 'openhpi/co_execenv_java:latest' + docker_image { 'openhpi/co_execenv_java:latest' } association :file_type, factory: :dot_java help - name 'Java 8' - network_enabled false - permitted_execution_time 10.seconds - pool_size 0 - run_command 'make run' + name { 'Java 8' } + network_enabled { false } + permitted_execution_time { 10.seconds } + pool_size { 0 } + run_command { 'make run' } singleton_execution_environment - test_command 'make test CLASS_NAME="%{class_name}" FILENAME="%{filename}"' - testing_framework 'JunitAdapter' + test_command { 'make test CLASS_NAME="%{class_name}" FILENAME="%{filename}"' } + testing_framework { 'JunitAdapter' } end factory :jruby, class: ExecutionEnvironment do created_by_teacher default_memory_limit - docker_image 'hklement/ubuntu-jruby:latest' + docker_image { 'hklement/ubuntu-jruby:latest' } association :file_type, factory: :dot_rb help - name 'JRuby 1.7' - network_enabled false - permitted_execution_time 10.seconds - pool_size 0 - run_command 'jruby %{filename}' + name { 'JRuby 1.7' } + network_enabled { false } + permitted_execution_time { 10.seconds } + pool_size { 0 } + run_command { 'jruby %{filename}' } singleton_execution_environment - test_command 'rspec %{filename} --format documentation' - testing_framework 'RspecAdapter' + test_command { 'rspec %{filename} --format documentation' } + testing_framework { 'RspecAdapter' } end factory :node_js, class: ExecutionEnvironment do created_by_teacher default_memory_limit - docker_image 'hklement/ubuntu-node:latest' + docker_image { 'hklement/ubuntu-node:latest' } association :file_type, factory: :dot_js help - name 'Node.js' - network_enabled false - permitted_execution_time 10.seconds - pool_size 0 - run_command 'node %{filename}' + name { 'Node.js' } + network_enabled { false } + permitted_execution_time { 10.seconds } + pool_size { 0 } + run_command { 'node %{filename}' } singleton_execution_environment end factory :python, class: ExecutionEnvironment do created_by_teacher default_memory_limit - docker_image 'openhpi/co_execenv_python:latest' + docker_image { 'openhpi/co_execenv_python:latest' } association :file_type, factory: :dot_py help - name 'Python 3.4' - network_enabled false - permitted_execution_time 10.seconds - pool_size 0 - run_command 'python3 %{filename}' + name { 'Python 3.4' } + network_enabled { false } + permitted_execution_time { 10.seconds } + pool_size { 0 } + run_command { 'python3 %{filename}' } singleton_execution_environment - test_command 'python3 -m unittest --verbose %{module_name}' - testing_framework 'PyUnitAdapter' + test_command { 'python3 -m unittest --verbose %{module_name}' } + testing_framework { 'PyUnitAdapter' } end factory :ruby, class: ExecutionEnvironment do created_by_teacher default_memory_limit - docker_image 'hklement/ubuntu-ruby:latest' + docker_image { 'hklement/ubuntu-ruby:latest' } association :file_type, factory: :dot_rb help - name 'Ruby 2.2' - network_enabled false - permitted_execution_time 10.seconds - pool_size 0 - run_command 'ruby %{filename}' + name { 'Ruby 2.2' } + network_enabled { false } + permitted_execution_time { 10.seconds } + pool_size { 0 } + run_command { 'ruby %{filename}' } singleton_execution_environment - test_command 'rspec %{filename} --format documentation' - testing_framework 'RspecAdapter' + test_command { 'rspec %{filename} --format documentation' } + testing_framework { 'RspecAdapter' } end factory :sinatra, class: ExecutionEnvironment do created_by_teacher default_memory_limit - docker_image 'hklement/ubuntu-sinatra:latest' + docker_image { 'hklement/ubuntu-sinatra:latest' } association :file_type, factory: :dot_rb - exposed_ports '4567' + exposed_ports { '4567' } help - name 'Sinatra' - network_enabled true - permitted_execution_time 15.minutes - pool_size 0 - run_command 'ruby %{filename}' + name { 'Sinatra' } + network_enabled { true } + permitted_execution_time { 15.minutes } + pool_size { 0 } + run_command { 'ruby %{filename}' } singleton_execution_environment - test_command 'rspec %{filename} --format documentation' - testing_framework 'RspecAdapter' + test_command { 'rspec %{filename} --format documentation' } + testing_framework { 'RspecAdapter' } end factory :sqlite, class: ExecutionEnvironment do created_by_teacher default_memory_limit - docker_image 'hklement/ubuntu-sqlite:latest' + docker_image { 'hklement/ubuntu-sqlite:latest' } association :file_type, factory: :dot_sql help - name 'SQLite' - network_enabled false - permitted_execution_time 1.minute - pool_size 0 - run_command 'sqlite3 /database.db -init %{filename} -html' + name { 'SQLite' } + network_enabled { false } + permitted_execution_time { 1.minute } + pool_size { 0 } + run_command { 'sqlite3 /database.db -init %{filename} -html' } singleton_execution_environment - test_command 'ruby %{filename}' - testing_framework 'SqlResultSetComparatorAdapter' + test_command { 'ruby %{filename}' } + testing_framework { 'SqlResultSetComparatorAdapter' } end trait :default_memory_limit do - memory_limit DockerClient::DEFAULT_MEMORY_LIMIT + memory_limit { DockerClient::DEFAULT_MEMORY_LIMIT } end trait :help do diff --git a/spec/factories/exercise.rb b/spec/factories/exercise.rb index 2fcd7e07..92ed180f 100644 --- a/spec/factories/exercise.rb +++ b/spec/factories/exercise.rb @@ -16,10 +16,10 @@ end FactoryBot.define do factory :audio_video, class: Exercise do created_by_teacher - description "Try HTML's audio and video capabilities." + description { "Try HTML's audio and video capabilities." } association :execution_environment, factory: :html - instructions 'Build a simple website including an HTML