Skip to content

Commit b27f629

Browse files
committed
updated seeds
1 parent 7976b30 commit b27f629

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

app/models/exercise.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class Exercise < ActiveRecord::Base
1313
belongs_to :user
1414
belongs_to :execution_environment
1515
has_many :descriptions
16-
validates :descriptions, presence: true
16+
#validates :descriptions, presence: true
1717

1818
accepts_nested_attributes_for :descriptions, allow_destroy: true
1919

app/views/home/_exercises.html.erb

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<div class="panel-body">
2525

2626
<div class="col-md-10">
27-
<%= exercise.descriptions.first.text %>
27+
<% unless exercise.descriptions.empty? %><%= exercise.descriptions.first.text %><% end %>
2828
</div>
2929

3030
<div class="btn-group-vertical pull-right" role="group" aria-label="...">

db/seeds.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
test_framework = TestingFramework.create(name: 'JUnit 4')
2626
test_framework2 = TestingFramework.create(name: 'Pytest')
2727

28-
exercise1 = Exercise.create(title: "Hello World", description: "Schreibe ein Java Programm, das 'Hello World' am Bildschirm ausgibt.", maxrating: '10', public: true, user_id:user1.id)
28+
exercise1 = Exercise.create(title: "Hello World", maxrating: '10', public: true, user_id:user1.id)
2929
ExerciseFile.create(main: true, content: "public class HelloWorld{ public static void main String[] args) { } }", path: '', solution: false, filetype: 'java', exercise: exercise1)
3030
Test.create(content: "public class HelloWorld{ public static void main String[] args) {System.out.println('Hello World.'); } }", rating: 5, feedback_message: "Es wird noch nicht 'Hello World' am Bildschrim ausgegeben!", exercise: exercise1, testing_framework: test_framework)
3131

@@ -52,7 +52,7 @@
5252

5353

5454

55-
exercise2 = Exercise.create(title: "Java Einstieg ", description: "In diesem Programm sind zwei Fehler versteckt. Versuche diese zu finden und zu beheben. Anschließend soll das Programm ""Hallo Welt"" ausgeben.\nFinde die beiden Fehler, die wir in das Programm eingebaut haben.", maxrating: '10', public: true, user_id:user2.id)
55+
exercise2 = Exercise.create(title: "Java Einstieg ", maxrating: '10', public: true, user_id:user2.id)
5656
ExerciseFile.create(main: true, content: "public class HalloWelt {\n // Hier haben sich zwei Fehler eingeschlichen\n public static void main (String [] args){\n System.out.println(Hallo Welt)\n }\n}", path: '', solution: false, filetype: 'java', exercise: exercise2)
5757
Test.create(content: "import static org.junit.Assert.*;\nimport java.io.ByteArrayOutputStream;\nimport java.io.PrintStream;\nimport org.junit.AfterClass;\nimport org.junit.Before;\nimport org.junit.BeforeClass;\nimport org.junit.Test;\npublic class HalloWeltTest1 {\n \n private final static ByteArrayOutputStream outContent = new ByteArrayOutputStream();\n private static PrintStream old;\n @BeforeClass\n public static void setUpStreams() {\n old = System.out;\n System.setOut(new PrintStream(outContent));\n }\n @AfterClass\n public static void cleanUpStreams() {\n System.setOut(old);\n }\n \n @Before\n public void resetOut(){\n outContent.reset();\n }\n \n @Test\n public void testIfErrorFree(){\n try{\n HalloWelt.main(new String[] {});\n }catch (Error e){\n fail();\n }\n }\n @Test\n public void testSomething(){\n assert(true);\n }\n}", rating: 5, feedback_message: "Es existieren noch Fehler im Programm. Daher kann dieses noch nicht ausgeführt werden", exercise: exercise2, testing_framework: test_framework)
5858
Test.create(content: "import static org.junit.Assert.*;\nimport java.io.ByteArrayOutputStream;\nimport java.io.PrintStream;\nimport org.junit.AfterClass;\nimport org.junit.Before;\nimport org.junit.BeforeClass;\nimport org.junit.Test;\npublic class HalloWeltTest2 {\n \n private final static ByteArrayOutputStream outContent = new ByteArrayOutputStream();\n private static PrintStream old;\n @BeforeClass\n public static void setUpStreams() {\n old = System.out;\n System.setOut(new PrintStream(outContent));\n }\n @AfterClass\n public static void cleanUpStreams() {\n System.setOut(old);\n }\n \n @Before\n public void resetOut(){\n outContent.reset();\n }\n \n @Test\n public void checkForCorrectOutput(){\n HalloWelt.main(new String[] {});\n String separator = System.getProperty(""line.separator"");\n assertEquals(""Hallo Welt""+separator, outContent.toString());\n }\n @Test\n public void testSomething(){\n assert(true);\n }\n}", rating: 1, feedback_message: "Es wird ein falscher String ausgegeben, erwartet ist die Ausgabe\nHallo Welt", exercise: exercise2, testing_framework: test_framework)
@@ -71,7 +71,7 @@
7171
exercise2.labels << l3
7272

7373

74-
exercise3 = Exercise.create(title: "Asterisk Pattern", description: "Schreibe ein Java Programm, das das Asterisk Pattern ausgibt. Das Pattern sieht folgendermaßen aus: ***** ***** ***** ***** *****", maxrating: '10', public: true, user_id:user3.id)
74+
exercise3 = Exercise.create(title: "Asterisk Pattern", maxrating: '10', public: true, user_id:user3.id)
7575
ExerciseFile.create(main: true, content: "public class AsteriksPattern{ public static void main String[] args) { } }", path: '', solution: false, filetype: 'java', exercise: exercise3)
7676

7777

@@ -104,7 +104,7 @@
104104
exercise3.labels << l3
105105

106106

107-
exercise4 = Exercise.create(title: "factorial of given numbers", description: "Write a program which can compute the factorial of a given numbers. The results should be printed in a comma-separated sequence on a single line.", maxrating: '10', public: true, user_id:user4.id)
107+
exercise4 = Exercise.create(title: "factorial of given numbers", maxrating: '10', public: true, user_id:user4.id)
108108
ExerciseFile.create(main: true, content: "def fact(x): return", path: '', solution: false, filetype: 'python', exercise: exercise4)
109109

110110

0 commit comments

Comments
 (0)