wip2

Author: arkirchner

spec/factories/execution_environment.rb

@@ -1,11 +1,27 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
+  factory :coffee_script, class: 'ExecutionEnvironment' do
+    created_by_teacher
+    default_memory_limit
+    default_cpu_limit
+    docker_image { 'hklement/ubuntu-coffee:latest' }
+    file_type { association :dot_coffee, user: }
+    help
+    name { 'CoffeeScript' }
+    network_enabled { false }
+    privileged_execution { 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
     default_cpu_limit
-    docker_image { 'openhpi/co_execenv_ruby:latest' }
+    docker_image { 'hklement/ubuntu-html:latest' }
     file_type { association :dot_html, user: }
     help
     name { 'HTML5' }
@@ -37,11 +53,29 @@
     testing_framework { 'JunitAdapter' }
   end
 
+  factory :jruby, class: 'ExecutionEnvironment' do
+    created_by_teacher
+    default_memory_limit
+    default_cpu_limit
+    docker_image { 'hklement/ubuntu-jruby:latest' }
+    file_type { association :dot_rb, user: }
+    help
+    name { 'JRuby 1.7' }
+    network_enabled { false }
+    privileged_execution { 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' }
+  end
+
   factory :node_js, class: 'ExecutionEnvironment' do
     created_by_teacher
     default_memory_limit
     default_cpu_limit
-    docker_image { 'openhpi/co_execenv_node:latest' }
+    docker_image { 'hklement/ubuntu-node:latest' }
     file_type { association :dot_js, user: }
     help
     name { 'Node.js' }
@@ -75,7 +109,7 @@
     created_by_teacher
     default_memory_limit
     default_cpu_limit
-    docker_image { 'openhpi/co_execenv_ruby:latest' }
+    docker_image { 'hklement/ubuntu-ruby:latest' }
     file_type { association :dot_rb, user: }
     help
     name { 'Ruby 2.2' }
@@ -89,6 +123,43 @@
     testing_framework { 'RspecAdapter' }
   end
 
+  factory :sinatra, class: 'ExecutionEnvironment' do
+    created_by_teacher
+    default_memory_limit
+    default_cpu_limit
+    docker_image { 'hklement/ubuntu-sinatra:latest' }
+    file_type { association :dot_rb, user: }
+    exposed_ports { [4567] }
+    help
+    name { 'Sinatra' }
+    network_enabled { true }
+    privileged_execution { false }
+    permitted_execution_time { 15.minutes }
+    pool_size { 0 }
+    run_command { 'ruby %{filename}' }
+    singleton_execution_environment
+    test_command { 'rspec %{filename} --format documentation' }
+    testing_framework { 'RspecAdapter' }
+  end
+
+  factory :sqlite, class: 'ExecutionEnvironment' do
+    created_by_teacher
+    default_memory_limit
+    default_cpu_limit
+    docker_image { 'hklement/ubuntu-sqlite:latest' }
+    file_type { association :dot_sql, user: }
+    help
+    name { 'SQLite' }
+    network_enabled { false }
+    privileged_execution { 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' }
+  end
+
   trait :default_memory_limit do
     memory_limit { ExecutionEnvironment::DEFAULT_MEMORY_LIMIT }
   end

spec/factories/exercise.rb

@@ -158,6 +158,20 @@ def create_seed_file(exercise, path, file_attributes = {})
     end
   end
 
+  factory :sql_select, class: 'Exercise' do
+    created_by_teacher
+    description { 'Learn to use the SELECT statement.' }
+    execution_environment { association :sqlite, user: }
+    instructions { "Write a query which selects the full rows for all people with the last name 'Doe'." }
+    title { 'SELECT' }
+
+    after(:create) do |exercise|
+      create_seed_file(exercise, 'sql_select/exercise.sql', role: 'main_file')
+      create_seed_file(exercise, 'sql_select/comparator.rb', feedback_message: 'Your solution is not correct yet.', hidden: true, role: 'teacher_defined_test')
+      create_seed_file(exercise, 'sql_select/reference.sql', hidden: true, role: 'reference_implementation')
+    end
+  end
+
   factory :tdd, class: 'Exercise' do
     created_by_teacher
     description { 'Learn to appreciate test-driven development.' }
@@ -171,6 +185,18 @@ def create_seed_file(exercise, path, file_attributes = {})
     end
   end
 
+  factory :web_app, class: 'Exercise' do
+    created_by_teacher
+    description { 'Build a simple Web application with Sinatra.' }
+    execution_environment { association :sinatra, user: }
+    instructions
+    title { 'A Simple Web Application' }
+
+    after(:create) do |exercise|
+      create_seed_file(exercise, 'web_app/app.rb', role: 'main_file')
+    end
+  end
+
   trait :instructions do
     instructions { Forgery(:lorem_ipsum).words(Forgery(:basic).number(at_least: 50, at_most: 100)) }
   end

spec/system/exercises_system_spec.rb

@@ -19,13 +19,17 @@
     visit(sign_in_path)
     fill_in('email', with: teacher.email)
     fill_in('password', with: attributes_for(:teacher)[:password])
-    click_button(I18n.t('sessions.new.link'))
+    click_on(I18n.t('sessions.new.link'))
+    wait_for_ajax
+    click_on('Administration')
+    click_on('Exercises')
+    all('a', text: 'Exercises').last.click
+    click_on('Add Exercise')
+
     wait_for_ajax
   end
 
   it 'creates a minimal exercise' do
-    visit new_exercise_path
-
     fill_in :exercise_title, with: 'Ruby challenge'
     fill_in :exercise_internal_title, with: 'Project Ruby first challenge'
 
@@ -41,19 +45,11 @@
 
     submission_deadline = 3.months.from_now
 
-    chosen_select('exercise_submission_deadline_1i', submission_deadline.year.to_s)
-    chosen_select('exercise_submission_deadline_2i', submission_deadline.strftime('%B'))
-    chosen_select('exercise_submission_deadline_3i', submission_deadline.day.to_s)
-    chosen_select('exercise_submission_deadline_4i', submission_deadline.hour.to_s)
-    chosen_select('exercise_submission_deadline_5i', submission_deadline.min.to_s)
+    chosen_date_time_select('Submission Deadline', submission_deadline)
 
     late_submission_deadline = submission_deadline + 1.week
 
-    chosen_select('exercise_late_submission_deadline_1i', late_submission_deadline.year.to_s)
-    chosen_select('exercise_late_submission_deadline_2i', late_submission_deadline.strftime('%B'))
-    chosen_select('exercise_late_submission_deadline_3i', late_submission_deadline.day.to_s)
-    chosen_select('exercise_late_submission_deadline_4i', late_submission_deadline.hour.to_s)
-    chosen_select('exercise_late_submission_deadline_5i', late_submission_deadline.min.to_s)
+    chosen_date_time_select('Late Submission Deadline', submission_deadline)
 
     check 'Public'
 
@@ -69,7 +65,7 @@
       chosen_select('File Type', 'Ruby')
       chosen_select('Role', 'Main File')
 
-      select('Read-only')
+      check('Read-only')
 
       all('input').last.set(Rails.root.join('db/seeds/fibonacci/reference.rb'))
     end
@@ -80,10 +76,21 @@
   end
 
   def chosen_select(name, value)
-    id = find('label', text: name)[:for]
+    id = first('label', text: name)[:for]
+
     set_value_for_chosen_element(id, value)
   end
 
+  def chosen_date_time_select(name, date)
+    id = first('label', text: name)[:for]
+
+    set_value_for_chosen_element("#{id}_1i", date.year.to_s)
+    set_value_for_chosen_element("#{id}_2i", date.strftime('%B'))
+    set_value_for_chosen_element("#{id}_3i", date.day.to_s)
+    set_value_for_chosen_element("#{id}_4i", date.hour.to_s)
+    set_value_for_chosen_element("#{id}_5i", date.min.to_s)
+  end
+
   def set_value_for_chosen_element(id, value)
     element = find_by_id("#{id}_chosen")
     element.click